Commit Graph

645 Commits (a45088cb6b94a8d7f64a47b1a3fef1c95bcea607)

Author SHA1 Message Date
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Ansariel e1ce6e3d58 Merge Firestorm LGPL tip 2015-01-08 23:12:58 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Nicky 2f7be51b6b Purge list for (temporary) derender each TP. Which in theory should bring temp. derendered items back after TP. In practice this alone does not work reliable all the time yet. 2014-06-16 21:55:59 +02:00
Tank_Master 8863d9beaf Compile fixes 2014-06-09 23:27:05 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Ansariel 3081be8ceb FIRE-13050: Remove option to prevent sending of avatar physics data 2014-05-15 11:48:34 +02:00
ziree 6cdbc879d5 Do not allow no copy items to be restored to last position. FIRE-13672 2014-05-09 14:03:37 +02:00
Ansariel a24e5dc9f2 FIRE-1568: Fix sit on AFK issues (standing up when sitting before) 2014-05-01 19:05:59 +02:00
Ansariel 72c4a8f71e FIRE-12229: Limited to 42 groups on an opensim grid; Patch by Cinder Roxley 2014-04-17 09:28:15 +02:00
Ansariel 26aa6ad7cc Refactor LSL bridge to better work with OpenSim, provided by Cinder Roxley:
* Don't flip UseLSLBridge setting when in OpenSim
* Check for bridge existence before using it
* Cut off the bridge creation process on OpenSim
* Some other refactoring
2014-04-05 22:02:32 +02:00
Northspring bf1191e252 Thanks to Cinder for a bit better implementation of 105facd58d61 (one string operation less, by assigning the string after declaration) 2014-03-17 18:24:43 +01:00
Northspring 72e4465b65 FIRE-10718: llGetSimulatorHostname() is causing LSL Bridge to sleep for 10 seconds during check for current hostname in order to prevent double-click teleport on SL grid, so let's check this in the viewer itself and send 1/0 as additional value
Thanks to Nicky for reminding me about the LLGridManager class
2014-03-16 08:08:23 +01:00
Aura Linden 451d2ce7c3 Fix position hiding on failed teleports on mac. 2014-09-08 13:55:23 -07:00
Aura Linden 10e560ba25 Allegedly hides voice position on teleport. Needs testing. 2014-08-15 18:49:54 -07:00
Oz Linden a5e56067c2 merge changes for 3.7.2-release 2014-03-03 15:36:34 -05:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Brad Payne (Vir Linden) 969cb45920 merge 2014-02-11 16:04:31 -05:00
Oz Linden 197db4976a merge changes for 3.6.13-release 2014-01-23 11:07:32 -05:00
Oz Linden 30f0d61510 merge changes for 3.6.12-release 2014-01-03 12:14:03 -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 0e346960bb add LLAgent::removeRegionChangedCallback 2013-12-17 13:05:12 -05:00
Brad Payne (Vir Linden) 744cf6be8d merge 2013-12-05 10:39:35 -05:00
Richard Linden 34ff2fc46b merge with release 2013-12-02 14:57:29 -08:00
Jonathan Yap 176901422f STORM-68 Reapply changes to inventory processing lost in the merge.
Move call to updateCap back to where it was.  The place it was moved
to was too early in the login sequence and was causing a crash.
2013-11-20 10:21:41 -05:00
Oz Linden 0031e9a97b merge up to 3.6.10-release; some of the storm-68 changes lost 2013-11-19 17:59:55 -05:00
Jonathan Yap b7edc965bc STORM-68 Place initial call to send cap in new, better location.
Make processing of debug setting names a little more elegant.
2013-11-19 16:32:41 -05:00
Oz Linden fcc885d4fc replace uses of LLEnvManagerNew::setRegionChangeCallback with LLAgent::addRegionChangedCallback 2013-11-19 15:51:27 -05:00
Oz Linden a5db4f6c3d add documentation to LLAgent::addRegionChangedCallback and improve logging 2013-11-19 09:28:58 -05:00
Oz Linden 6bd777214c add callbacks to LLAgent for Region and Parcel changes 2013-11-18 19:05:34 -05:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Graham Linden 10705b4360 Merge 3.6.11 for RC-ability 2013-11-11 15:50:01 -08:00
Graham Linden 970ee73e9a Fix release merge issues (included upstream changes not yet in release from bear) 2013-10-25 11:48:43 -07:00
Brad Payne (Vir Linden) 1f8b37e9ad merge 2013-10-16 11:52:43 -04:00
Brad Payne (Vir Linden) 20af6640d4 SH-3455 WIP - llstartup cleanup 2013-10-15 11:17:20 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Brad Payne (Vir Linden) 029642b2bc SH-3455 WIP - post-SSA cleanup, including removal of mUseServerBakes and related methods 2013-09-23 16:48:49 -04:00
Brad Payne (Vir Linden) 48bc05e93f SH-3455 WIP - removing bake upload code 2013-09-19 16:14:59 -04:00
Brad Payne (Vir Linden) d58e7cfbfc SH-3455 WIP - removing bake upload code 2013-09-19 13:59:20 -04:00
Brad Payne (Vir Linden) 82f147367f SH-3455 WIP - removing bake upload code 2013-09-19 11:10:59 -04:00
Brad Payne (Vir Linden) 497d3f4bfc sunshine cleanup annotations 2013-09-18 17:04:34 -04:00
Brad Payne (Vir Linden) 36bb33b12a sunshine cleanup annotations 2013-09-18 17:03:34 -04:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Xiaohong Bao 01098f5dab eliminate some redundant geometry rebuilding operations during teleporting 2013-09-09 11:29:25 -06:00
Brad Payne (Vir Linden) 144eb1912d merge 2013-09-04 13:41:51 -04:00
Xiaohong Bao f713fe492f fix for SH-4295: Interesting: Teleporting to previous location leave some objects invisible. 2013-08-30 11:02:15 -06:00
simon 27d637d0f1 Merge downstream code from CHUIStorm release 2013-08-26 14:43:23 -07:00