0e346960bb
add LLAgent::removeRegionChangedCallback
2013-12-17 13:05:12 -05:00
96e26e2ee4
add LLAgent::removeRegionChangedCallback
2013-12-17 13:05:12 -05:00
9f056c1ddd
merge changes for open-113
2013-12-17 11:16:02 -05:00
2ea9f3d700
merge changes for 3.6.12-release
2013-12-17 11:15:01 -05:00
1219fe0e1b
Mac Fullscreen fix for MAINT-3288 and MAINT-3135
2013-12-17 00:13:07 -08:00
ddd6b8f91b
Mac Fullscreen fix for MAINT-3288 and MAINT-3135
2013-12-17 00:12:26 -08:00
798d62a467
ACME-1233 : Avoid iteration on the quality setting and make it more consistent
2013-12-16 15:20:53 -08:00
e774431783
merge changes for storm-1993
2013-12-16 13:31:49 -05:00
f1acdc56b2
merge changes for storm-1992
2013-12-16 13:30:56 -05:00
8df635f8bf
merge changes for storm-1989
2013-12-16 13:30:00 -05:00
01cdc87d05
merge changes for storm-1987
2013-12-16 13:29:12 -05:00
a57bcc2790
merge changes for storm-1986
2013-12-16 13:28:05 -05:00
36281d53ff
merge changes for storm-1981
2013-12-16 13:27:13 -05:00
6f34508aa9
Merge downstream code
2013-12-13 10:01:43 -08:00
99de75c225
MAINT-3522 FIXED Continue loop after adding Nearby chat history to the list.
2013-12-13 16:48:28 +02:00
ea940a2113
merge
2013-12-13 00:06:04 +02:00
dec487cd7f
merge changes for 3.6.12-release
2013-12-12 15:51:43 -05:00
c804c6b69e
STORM-68 Remove Apply button
...
Add menu entry to Build->Options->Set Default Permissions...
Disable Preferences->Advanced->Default Creation Permissions button when on login screen
Add code for a one-time conversion from the old upload settings
XML cleanup
2013-12-12 14:11:28 -05:00
4745ab85da
Pull merge from lindenlab/viewer-acme
2013-12-12 09:59:50 -08:00
a4f121f065
Pull merge from lindenlab/viewer-release
2013-12-12 09:03:21 -08:00
2d701456a0
STORM-68 Fix bug for new gestures, notecards, and scripts where a copied item did not preserve its default permissions.
...
Add apply button.
2013-12-12 08:51:15 -05:00
72d2d1a975
MAINT-3519 (Resident is able to share worn clothes.)
2013-12-12 09:38:02 +02:00
6a89cb6f25
Pull merge from lindenlab/viewer-acme
2013-12-11 21:48:21 -08:00
26a6668fb2
ACME-1233 : Set the quality for jpeg images send to Facebook correctly
2013-12-11 21:46:17 -08:00
2a1098552e
MAINT-3541 (crash in std::vector >::reserve)
2013-12-12 07:24:13 +02:00
f3a50a5084
MAINT-3541 (crash in std::vector >::reserve)
2013-12-12 07:24:13 +02:00
35add2252b
MAINT-3575: remove old exe if found in current install directory
2013-12-11 17:43:55 -05:00
06d6659845
removing of dos line ending
2013-12-11 22:01:24 +02:00
97d9eee4ff
OPEN-113 Use better way of testing for stub that will not impact TPVs.
2013-12-11 14:29:52 -05:00
35daa80319
STORM-68 Re-add wearables callback that did not carry through in the merge.
2013-12-11 12:09:39 -05:00
69dfa3507a
Workaround for MAINT 3099: remove any Vivox log file left in the program folder
2013-12-11 11:17:31 -05:00
81d1d427f1
OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in OS built viewers
2013-12-11 10:41:28 -05:00
9399448987
BUG-4685: remove any SecondLife.exe file left in the SecondLifeViewer folder by an install prior to 3.12
2013-12-11 09:53:48 -05:00
065bbf7d38
MAINT-3553 Another checking is added to avoid possible crash.
2013-12-11 14:42:02 +02:00
5e55cfd49e
SH-4653 FIX Interesting: Viewer crashes while reading chat history
...
fixed code that was causing abnormal thread termination in the first place
2013-12-10 16:43:23 -08:00
1522c1b3bd
SH-4653 FIX Interesting: Viewer crashes while reading chat history
...
fix for crash on exit resulting from 8c0e024d0c33
2013-12-10 15:48:57 -08:00
0b40ee53e3
BUILDFIX: bad use of non static member
2013-12-10 14:04:09 -08:00
b562de469a
STORM-68 Move initial call to POST default permissions to a better location.
2013-12-10 16:25:57 -05:00
9acc630010
fix for license wording
2013-12-10 16:25:37 -05:00
321a81e371
Re-fix merge issue that removed "AvatarRenderInfo" cap usage
2013-12-10 13:24:10 -08:00
d4f3fe3c56
SH-4653 FIX Interesting: Viewer crashes while reading chat history
2013-12-10 12:50:23 -08:00
c017694d39
MAINT-3571: include settings_install.xml whether it contains settings or not
2013-12-10 15:42:21 -05:00
88f139594b
Added placeholder http SLURL for Twitter sharing on Aditi for ACME-1216
2013-12-10 18:55:49 +00:00
e6efb8f297
Pull merge from lindenlab/viewer-release
2013-12-10 10:49:11 -08:00
8d5605e09f
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-12-10 10:36:54 -08:00
e896c19cc1
merge
2013-12-10 10:12:01 -05:00
dd0d7de67d
Automated merge with http://bitbucket.org/lindenlab/viewer-lion
2013-12-09 16:15:13 -08:00
50cba7940f
Merge in downstream code for 3.6.13
2013-12-09 16:11:09 -08:00
813bc232e7
MAINT-3017 FIX Inventory filter for Recent tab does not persist between sessions as it used to.
...
added names back to inventory filters, so they can be deserialized
2013-12-09 15:42:51 -08:00
1269634e21
Pulled viewer-release
2013-12-09 14:31:08 -08:00
Oz Linden