e9976b07f9
Merges in fix for Maint-5707
2014-04-15 10:32:13 -07:00
e5dae42252
Fix for MAINT-5707 bad breakpad behavior with teleport links
2014-04-14 15:11:42 -07:00
e36b905395
revived some deleted files to get mac build working
2014-04-08 18:00:54 -07:00
375c05ac43
merge changes for 3.7.5-release
2014-04-08 11:41:12 -04:00
a60875e549
merge latest changes from Ima
2014-04-08 11:40:10 -04:00
32bbb07f0a
merge changes for 3.7.5-release
2014-04-08 11:36:22 -04:00
a677d87d0f
fix for build errors...removed duplicate definition of getpid on windows
2014-04-07 19:32:24 -07:00
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
828ff16183
Pulled viewer-vivox4.6 into this branch for future RC.
2014-04-07 17:10:28 -07:00
d476b12ae5
Merged viewer release into vivox
2014-04-07 17:04:09 -07:00
c9a9ab1b6a
Pull merge from lindenlab/viewer-release
2014-04-07 16:31:32 -07:00
220b4166e7
Automated merge with http://hg.secondlife.com/viewer-release
2014-04-07 15:58:23 -04:00
7e966f28da
increment viewer version to 3.7.6
2014-04-07 15:12:21 -04:00
130e78d0a0
Added tag 3.7.5-release for changeset fc066b82343f
2014-04-07 15:12:21 -04:00
08ca5279ff
storm-1831: Fixing the remaining LL_ERRS.
2014-03-28 21:32:30 +00:00
8bc4278412
strom-1831: Cleaning out commented and unused code
2014-03-28 17:21:36 +00:00
ba892274b3
DRTVWR-363: Fix LLNotificationsListener::listChannels() channel walk.
...
LLNotifications::ChannelMap went away when LLNotificationChannel became an
LLInstanceTracker subclass. Iterate the universe of channels using
LLNotificationChannel::beginInstances(), endInstances() instead.
More troubling is that LLNotificationChannel::getParentChannelName() went away
too. When LLNotificationChannel acquired a Params block and corresponding
constructor, it acquired the ability to listen on multiple upstream sources.
That meant that a single mParent string became inapplicable, and its access
method was removed. (Curiously, mParent was not itself removed, but it was
left unused.) Change mParent to mParents, a vector<string>, built by
connectToChannel(). Introduce getParents(), an accessor returning an
iterator_range over that vector.
Change LLNotificationsListener::listChannels() to collect a "parents" key in
the map returned for each channel, and -- for backwards compatibility --
capture the first entry in the "parents" array as "parent".
2014-03-28 10:30:03 -04:00
0fddf9656b
DRTVWR-363: re-enable commented-out LLNotificationsListener::listChannels()
...
and its caller.
2014-03-27 20:03:08 -04:00
dfd78e83d9
Pulled merge from release
2014-03-27 11:59:35 -07:00
8e53c5bfb0
storm-1831 Removing the callback after first region crossing. Prevents repeated callbacks after highlighting has been removed for live script.
2014-03-26 20:31:05 +00:00
1d15ac293b
Double init of logging probably due to merge fail.
2014-03-26 05:26:10 -07:00
9ea2694c0e
Not ideal but sufficient.
2014-03-26 02:07:29 -07:00
88b23a5153
Merged
2014-03-25 18:34:02 -07:00
5b7929364b
Still wasn't doing the right thing with log files.
2014-03-25 18:30:39 -07:00
77432c1ed2
It would help to specify the correct destination directory genius.
2014-03-25 17:26:59 -07:00
fdb65d2c28
Fixed dumb mistake.
2014-03-25 14:05:51 -07:00
0893b49ebd
The simple approach has not worked. This hybrid solution should avoid the Windows issues and get us per-run logfiles.
2014-03-24 22:44:51 -07:00
78eada5b6c
Pull merge from lindenlab/viewer-release
2014-03-24 21:07:57 -07:00
e5bbdafded
merge with release
2014-03-24 19:23:34 -07:00
877f87a360
Old is the new new.
2014-03-24 15:19:03 -07:00
0908535c46
merge changes for 3.7.4-release
2014-03-24 15:18:16 -04:00
77ec712b15
Merged in viewer-release.
2014-03-24 11:30:17 -07:00
31a3a3da5d
increment viewer version to 3.7.5
2014-03-24 14:20:14 -04:00
0f9c05af1d
Added tag 3.7.4-release for changeset d076568ff788
2014-03-24 14:16:45 -04:00
6db0a2a7ea
merge changes for DRTVWR-360
2014-03-24 14:15:56 -04:00
103529e074
Pulled merge from release.
2014-03-24 09:59:53 -07:00
6908cb20fd
remove some obsolete BuildParams entries
2014-03-21 17:14:20 -04:00
489f265be2
Current log was actually correct.
2014-03-21 13:58:39 -07:00
35ab71d8ea
Returned Secondlife.log to main directory due to unforeseen LLErrorThread complexities.
2014-03-20 12:04:39 -07:00
776aadf4ef
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS
2014-03-19 17:30:07 -04:00
bd4f4ee793
logging cleanup in support of debugging text editor problems
2014-03-19 14:17:13 -04:00
3dc44c91dc
merge changes for STORM-2020
2014-03-18 11:30:49 -04:00
d60519d253
merge changes for STORM-2007
2014-03-18 10:46:52 -04:00
c617a2aa33
merge changes for STORM-1966
2014-03-18 09:10:19 -04:00
cb2bd57709
ACME-1376 : Take the location checkbox out of the photo panel
2014-03-17 14:59:49 -07:00
3372649d1b
Restore use of RenderSpecularExponent
2014-03-17 15:26:47 -04:00
0bc8e67ebb
Mac Debug build is functional with this manifest change
2014-03-15 18:18:58 -04:00
1e764fb668
Consistent set of fmodex 4.44.31 builds now.
2014-03-14 21:14:32 -04:00
c62d2cca29
Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.
...
Copy3rdPartyLibs needed to copy the now-corrected fmodexL libraries
and it had a bad library reference on Linux for release. In
llaudio land, the audio engine interfaces, even the fmodex
specializations, seem to want to be external-structure free
so use a forward declaration and pointer to FMOD_DSP_DESCRIPTION
and deal with it in the ctor/dtor.
2014-03-14 20:58:35 -04:00
4f565ed077
Update fmodex to 4.44.31. Move DSP descriptor to heap storage.
2014-03-14 19:48:35 -04:00
Aura Linden