03969822f5
Merged in viewer-development changes
2011-06-28 11:48:25 -07:00
df91a44d29
STORM-1423 (aka VOICE-3) merged from
...
roxie_linden/viewer-developement
2011-06-28 11:43:39 -07:00
a67627777d
STORM-1372, STORM-1439
...
Merged in:
alain_linden/viewer-development
lindenlab/viewer-development
2011-06-28 11:25:42 -07:00
3bc99274f1
STORM-1334: compute area using integer math to avoid type conflict
2011-06-28 10:22:36 -04:00
8e6ea481cf
merge changes for storm-1103
2011-06-28 09:22:50 -04:00
94bb9c5955
merge changes for storm-323
2011-06-28 09:22:15 -04:00
2ee2f1d6ff
merge changes for vwr-25480
2011-06-28 09:21:38 -04:00
b24f9295a2
merge changes for storm-1393
2011-06-28 09:20:53 -04:00
23d3b834bb
merge changes for storm-1334
2011-06-28 09:20:13 -04:00
2a789e9c50
merge changes for late beta fixes
2011-06-28 09:18:27 -04:00
0f140565a5
merge changes for beta tags
2011-06-28 09:17:57 -04:00
30f3148fbd
storm-1444: Disable mesh loading
2011-06-27 11:51:06 -04:00
7dac0bd49a
reconciled .hgtags
2011-06-27 09:35:22 -04:00
9928016ad9
Added tag DRTVWR-67_2.7.4-beta1, 2.7.4-beta1 for changeset be963a4eef63
2011-06-27 09:22:57 -04:00
5c9fc7d24f
increment viewer version to 2.7.6
2011-06-27 09:04:20 -04:00
311a431169
Added tag 2.7.5-start for changeset 19a498fa6257
2011-06-27 09:03:33 -04:00
bd6e1b7fd8
STORM-1103 sets a minimum size for map in nearby people and makes the map resizable
2011-06-26 11:22:42 -04:00
ca89422fb3
merge changes for storm-1443
2011-06-26 07:25:49 -04:00
873ba5178f
automated merge
2011-06-24 11:53:54 -07:00
44308a50c2
sync with viewer-development
2011-06-24 11:09:26 -07:00
11eb995e69
FIX VWR-25660 en_xui_change
2011-06-23 16:28:59 -07:00
6c18a086f3
FIX VWR-25408
2011-06-23 15:44:36 -07:00
cf5e9841a7
FIX VWR-25400
2011-06-23 15:39:55 -07:00
47f1f3f396
FIX VWR-25381
2011-06-23 15:23:30 -07:00
5f3c4f7e19
FIX VWR-25125
2011-06-23 14:47:07 -07:00
0476734f53
automated merge
2011-06-23 12:01:50 -07:00
35ba8f36e4
Fix for VOICE-3 [crashhunters] LLVoiceVoiceClient::stateMachine
...
Race condition with parcel changing while shutting down. If a parcel
changes, we went into code that requests the cap for the new
parcel voice channel info. This happened in any state, not
the two states where it is really appropriate. stateRunning
or stateNoSession.
When shutting down, we may be in stateTerminate, stateLeavingSession,
or so on, and we don't want to muck with getting caps and such during
that time.
2011-06-23 12:00:31 -07:00
02995303e9
merge changes for storm-899
2011-06-23 14:09:13 -04:00
b343d25d19
merge changes for storm-1437
2011-06-23 09:47:43 -04:00
f657e8e16f
remove error from build logs by taking out obsolete param (cg said this was ok to do)
2011-06-22 11:37:46 -04:00
c8232b6595
update codeticket configuration for my review builds
2011-06-22 11:36:52 -04:00
a5474e3398
remove a bunch of builds that are no longer needed
2011-06-22 11:30:18 -04:00
9a2e35f7ca
merge changes for storm-1421
2011-06-22 08:30:59 -04:00
3ef49a967b
STORM-899 [ILL-FORMED XML] 'No attachments worn' text on blank 'Attachments' accordion remains in English for all locales
...
Added / to xml file
2011-06-22 06:27:51 -04:00
80b81279a2
CHOP-662 Merged into viewer-development-crash-horde
2011-06-21 21:42:32 -07:00
84c44b8f8e
STORM-1368 Merge with veiewer-development-crash-horde
2011-06-21 21:40:54 -07:00
8c65351250
Pulled from viewer development
2011-06-21 20:50:16 -07:00
14105610c7
CHOP-662 cleanup in response to code review.
2011-06-21 20:46:32 -07:00
c0fa40141b
FIX VWR-25160 en_xui_change
2011-06-21 16:15:58 -07:00
54195e8125
FIX VWR-25159
2011-06-21 16:07:28 -07:00
2a3a01dcc9
FIX VWR-25118
2011-06-21 15:40:13 -07:00
00da6b3501
merged back tags and late changes from viewer-pre-beta
2011-06-21 16:58:31 -04:00
687a925fda
pull late release change back from viewer-pre-release
2011-06-21 16:57:27 -04:00
192f51f426
pull back tags from viewer-release
2011-06-21 16:14:10 -04:00
ed684fb2ed
FIX VWR-25072
2011-06-21 12:00:08 -07:00
6977c09a88
FIX VWR-25071
2011-06-21 11:58:54 -07:00
fae829c8ef
Fix EXP-825: check for null gAgentAvatarp to prevent crash (hopefully).
2011-06-21 08:54:34 -07:00
fcf2ed5901
merged .hgtags & BuildParams
2011-06-21 11:47:58 -04:00
4d77146b90
Added tag 2.7.4-start for changeset 6af10678de47
2011-06-21 07:25:19 -04:00
83b4eb2201
SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.
2011-06-20 16:42:31 -07:00
Squire