simon
da23625ba7
MAINT-3397 : fix to use slurl for localization handler for EstateManagerFailedllTeleportHome message
2014-01-15 10:12:51 -08:00
simon
32cef0ad14
Merge after backout
2014-01-10 13:17:26 -08:00
simon
cfadbe631f
Revert earlier back-out for MAINT-535 ... it's back in
2014-01-10 13:15:19 -08:00
Monty Brandenberg
883c0773f3
Merge. Refresh from viewer-release after 3.6.13 release.
2014-01-09 15:26:02 -05:00
Monty Brandenberg
b2fe32e572
SH-4667 HTTP Viewer reports network error instead of a misnamed joint on mesh upload
...
Tried to add consistent mesh upload retries in the HTTP work but a
combination of bad status choices in the upload service and the
one-shot nature of the upload capabilities means that status
information can be lost. For now, retain the wonderful manual
retry logic. At some future point, we might fix the services or
add application-level retry.
2014-01-09 15:18:54 -05:00
simon
6b4a357230
Merge 3.6.14 from release
2014-01-09 10:53:01 -08:00
Oz Linden
f1bb5c5ada
merge changes for 3.6.13-release
2014-01-08 18:47:21 -05:00
Oz Linden
d8a81b240e
increment viewer version to 3.6.14
2014-01-08 18:46:23 -05:00
Oz Linden
19a41cc243
Added tag 3.6.13-release for changeset 0d9b9e50f1a8
2014-01-08 18:45:48 -05:00
Kitty Barnett
133cbba470
- changed : "Give to #RLV" script-to-agent offers can contain subfolders
...
-> limited to 3 levels (e.g. #RLV/~FolderA/FolderB/FolderC)
-> #RLV folder is auto-created if it doesn't currently exist
--HG--
branch : RLVa
2014-01-08 01:12:58 +01:00
Kitty Barnett
2fd30a5fe3
- changed : "Give to #RLV" agent-to-agent offers can contain subfolders
...
-> limited to 3 levels (e.g. #RLV/~FolderA/FolderB/FolderC)
-> #RLV folder is auto-created if it doesn't currently exist
--HG--
branch : RLVa
2014-01-08 00:33:27 +01:00
simon
f291995dac
Revert changes made for MAINT-535 to test in a release cohort.
2014-01-07 15:18:29 -08:00
Oz Linden
fcac9fdadd
merge changes for Snowstorm fall contributions
2014-01-07 15:15:59 -05:00
Oz Linden
a25bcb8523
merge changes for storm-1980
2014-01-07 13:44:22 -05:00
Jonathan Yap
24c5ac7417
STORM-1980 Center floater on screen. Tweak shaking parameters.
2014-01-04 10:40:20 -05:00
Oz Linden
05a313f546
change shaking to decay exponentially
2014-01-03 18:19:25 -05:00
Jonathan Yap
6051a86557
STORM-1980 Small optimization and tweaks of shaking constants
2014-01-03 14:08:55 -05:00
Jonathan Yap
d15cc2dadc
STORM-1980 Add shake effect
2014-01-03 13:31:51 -05:00
Oz Linden
30f0d61510
merge changes for 3.6.12-release
2014-01-03 12:14:03 -05:00
Oz Linden
ad40f7534f
correct merge
2014-01-02 18:32:51 -05:00
Oz Linden
4e4cf8b528
increment version to 3.7.0
2014-01-02 18:09:29 -05:00
Oz Linden
a56d113911
merge changes for 3.6.12-release
2014-01-02 17:05:51 -05:00
Jonathan Yap
5f635f7942
STORM-1980 Remove callback in destructor.
...
Shrink floater and add a "!" icon in the top left corner.
2014-01-02 13:40:16 -05:00
Oz Linden
94ac0ffdc3
merge changes for 3.6.12-release
2013-12-19 17:32:58 -05:00
Oz Linden
8b01fd42b0
merge changes from project qa viewer
2013-12-19 17:30:58 -05:00
Oz Linden
03e84beac0
merge addition of LLAgent::removeRegionChangeCallback
2013-12-19 12:11:13 -05:00
Oz Linden
e10c32b30a
clean up audio engine logging
2013-12-19 12:10:26 -05:00
Oz Linden
05fa5e525b
improve build.sh searches for additional package installers
2013-12-18 14:53:27 -05:00
Oz Linden
02afa9cfb0
STORM-1980: set new region restart sound uuid
2013-12-18 13:39:18 -05:00
Ima Mechanique
1886428638
STORM-1831 Changing addRegionChangedCallback to more closely resemble the feature it replaces. This fixes the crashes reported by Whirly ;-)
2013-12-18 06:26:22 +00:00
Oz Linden
ba39f6e14f
add "A" test channel package
2013-12-17 16:42:01 -05:00
Oz Linden
0e346960bb
add LLAgent::removeRegionChangedCallback
2013-12-17 13:05:12 -05:00
Oz Linden
9f056c1ddd
merge changes for open-113
2013-12-17 11:16:02 -05:00
Oz Linden
2ea9f3d700
merge changes for 3.6.12-release
2013-12-17 11:15:01 -05:00
Oz Linden
e774431783
merge changes for storm-1993
2013-12-16 13:31:49 -05:00
Oz Linden
f1acdc56b2
merge changes for storm-1992
2013-12-16 13:30:56 -05:00
Oz Linden
8df635f8bf
merge changes for storm-1989
2013-12-16 13:30:00 -05:00
Oz Linden
01cdc87d05
merge changes for storm-1987
2013-12-16 13:29:12 -05:00
Oz Linden
a57bcc2790
merge changes for storm-1986
2013-12-16 13:28:05 -05:00
Oz Linden
36281d53ff
merge changes for storm-1981
2013-12-16 13:27:13 -05:00
MaximB ProductEngine
2a1098552e
MAINT-3541 (crash in std::vector >::reserve)
2013-12-12 07:24:13 +02:00
Oz Linden
35add2252b
MAINT-3575: remove old exe if found in current install directory
2013-12-11 17:43:55 -05:00
maksymsproductengine
06d6659845
removing of dos line ending
2013-12-11 22:01:24 +02:00
Jonathan Yap
97d9eee4ff
OPEN-113 Use better way of testing for stub that will not impact TPVs.
2013-12-11 14:29:52 -05:00
Kitty Barnett
5d9f7c7ba8
- internal : undo weird rearranging of code in process_improved_im
...
--HG--
branch : RLVa
2013-12-11 20:23:46 +01:00
Oz Linden
69dfa3507a
Workaround for MAINT 3099: remove any Vivox log file left in the program folder
2013-12-11 11:17:31 -05:00
Jonathan Yap
81d1d427f1
OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in OS built viewers
2013-12-11 10:41:28 -05:00
Oz Linden
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
Mnikolenko ProductEngine
334d7e8618
MAINT-3553 Another checking is added to avoid possible crash.
2013-12-11 14:42:02 +02:00
Mnikolenko ProductEngine
065bbf7d38
MAINT-3553 Another checking is added to avoid possible crash.
2013-12-11 14:42:02 +02:00