dbd6b58bf2
Fix funky merge problem
2013-01-31 10:53:03 -08:00
799728b935
Pull in viewer-cat
2013-01-30 15:26:12 -08:00
ee87ef2303
merge downstream code from viewer-lion
2013-01-30 15:25:09 -08:00
60d1404b21
Merge in viewer-development
2013-01-30 15:03:39 -08:00
e7c0f69c8e
pull back more 3.4.5 beta fixes
2013-01-29 22:35:11 -05:00
d331592fc7
merge changes for MAINT-2276
2013-01-29 19:22:00 -05:00
2fa8205d4d
MAINT-2281: correct test for XP (corrected fix I applied incorrectly)
2013-01-29 18:39:51 -05:00
07deaaef88
tag merge of DRTVWR-292
2013-01-29 18:27:40 -05:00
4dfd99069f
MAINT-2288 Fix for physics shapes not showing up on "active" objects.
2013-01-29 16:10:58 -06:00
bfbf4a6c46
Added tag DRTVWR-291 for changeset 7f09bbc28c29
2013-01-29 14:12:55 -05:00
2676f516f2
For MAINT-2276 a workaround to unblock 3.4.5 beta review: ted
2013-01-28 10:15:10 -08:00
2ce44afc7f
[MAINT-2233] Duplicate entries in notifications.xml
...
- Removed duplicate entry from panel_preferences_general.xml
2013-01-26 01:47:37 +00:00
f566cd861b
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-01-25 17:43:41 -06:00
9f046e6b3f
MAINT-2268 Add right-click->"Mute Particle Owner" feature
2013-01-25 17:30:01 -06:00
b8f74b42a7
MAINT-2268 Add right-click->"Mute Particle Owner" feature
2013-01-25 17:29:44 -06:00
564f11679d
[MAINT-2233] Duplicate entries in notifications.xml
...
- Removed duplicate notification elements
2013-01-25 23:29:09 +00:00
276800e6f2
MAINT-2281: correct test for XP
2013-01-29 18:09:13 -05:00
dae5c6294a
merge changes for MAINT-2275, MAINT-2277
2013-01-25 14:43:48 -05:00
cc15a08ac4
merge changes for DRTVWR-290
2013-01-25 13:11:56 -05:00
c1827f7cf9
tag merge of DRTVWR-290
2013-01-25 13:11:52 -05:00
4d589df2fd
MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets
...
* A fix that doesn't break tanks. Reverts MAINT-1742
2013-01-24 15:32:36 -08:00
38ac8aa581
merge changes for MAINT-1481
2013-01-24 18:20:01 -05:00
51c8ffa2e2
tag merge of DRTVWR-289
2013-01-24 17:09:01 -05:00
aee0766f35
MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets
...
* A fix that doesn't break doors. Reverst MAINT-2247
2013-01-24 13:21:45 -08:00
3b369770f7
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
2013-01-24 14:28:09 -05:00
da9442b323
MAINT-2277 Yellow "fence" (selection) of the parcel doesn't update after selecting the other parcel
...
* Removed bogus check on matching parcel data coming in.
2013-01-24 09:45:31 -08:00
27e13e7330
MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets
2013-01-24 09:17:02 -08:00
cebde0a32b
Added tag 3.4.5-beta3 for changeset e06898df8644
2013-01-23 11:43:16 -05:00
a30a2c492d
pull back fix for MAINT-2242
2013-01-22 18:00:08 -05:00
c72a0b7bbc
MAINT-2158 - Particle grievance. Particles are not added at less than 4 fps.
...
Reviewed by Kelly
2013-01-22 13:51:19 -08:00
5ed25940af
merge changes for DRTVWR-287
2013-01-22 16:42:56 -05:00
2c58a49f23
tag merge of DRTVWR-287
2013-01-22 16:42:51 -05:00
ac6a19d456
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-01-22 12:10:06 -06:00
a5f5beb299
MAINT-2252 GPU Table update
2013-01-22 12:08:37 -06:00
4a9c53e9fd
merge changes for MAINT-2247
2013-01-18 14:43:12 -05:00
23336feed2
tag merge of DRTVWR-286
2013-01-18 12:51:16 -05:00
c0566aad4f
MAINT-1514 Viewer crashes while user trying to invite all friends to the group
...
* Enforce 100 max invites at the 'add to list' stage instead of only at 'sent to server'
* Cache the IDs in the list locally to avoid horrible performance pattern
2013-01-17 10:54:01 -08:00
7ecfa28c43
MAINT-2247 Child object does not update rotation while selected.
2013-01-16 15:21:11 -08:00
622d4f39a5
MAINT-2242 Fix for shader compilation errors on Intel HD graphics chips.
2013-01-16 15:20:32 -06:00
493e3a2407
merge changes for DRTVWR-284
2013-01-15 17:53:40 -05:00
a3aa1205b2
tag merge of DRTVWR-284
2013-01-15 17:52:17 -05:00
e826011091
merge changes for DRTVWR-282
2013-01-15 08:49:08 -05:00
fc06874061
tag merge of DRTVWR-282
2013-01-15 08:49:03 -05:00
3c08dccd5c
MAINT-2223 FIX Scroll list columns resize feature broken
...
column dirty flag was not set when user resized a column
2013-01-14 16:56:52 -08:00
4de7c27d93
Merge in viewer-development
2013-01-14 09:31:57 -08:00
db2d6816b1
merge changes for 3.4.5-beta2
2013-01-14 12:18:44 -05:00
c842494b77
Added tag 3.4.5-beta2 for changeset 6b9c7dbebef7
2013-01-14 10:43:57 -05:00
2e4e3c91bb
merge changes for DRTVWR-283
2013-01-14 09:50:14 -05:00
33d7784890
tag merge of DRTVWR-283
2013-01-14 09:50:09 -05:00
9f21775788
merge changes for DRTVWR-281
2013-01-11 18:42:56 -05:00
simon@Simon-PC.lindenlab.com