Commit Graph

491 Commits (bd3dc9cfe24ffc433783201e854f00bbd07aed54)

Author SHA1 Message Date
Rider Linden 109e2db131 Merge 2015-04-15 11:54:18 -07:00
Rider Linden 176d8cd268 Region caps and sim features converted to coroutine. 2015-04-15 11:51:48 -07:00
Rider Linden 82ae214f6a Merged lindenlab/viewer-tools-update into default 2015-04-14 09:34:49 -07:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Rider Linden edc1439bd6 Added AvatarNameCache as coroutine, with LLCore::HttpHandler to respond correctly to Event Pumps.
Added get/setRequestURL() to LLCore::HttpResponse
Removed URI from the HttpSDHandler.
2015-04-01 16:37:00 -07:00
Rider Linden 7353640387 first set of chnages from code review from Nat 2015-03-27 17:00:02 -07:00
Rider Linden 97b9317969 Create trivial handler for SD Messages, method in LLAgent for posting HTTP requests. 2015-03-26 13:32:09 -07:00
Rider Linden f6ba7514d2 Fix line endings on appearancemgr and added LLCore::Http to llAgent. 2015-03-26 10:34:19 -07:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
Mnikolenko ProductEngine 0a32de770d MAINT-1871 FIXED Don't allow moving avatar while changing camera position. 2014-12-03 11:58:41 +02:00
callum_linden 91eab4a9ea Update to build on Xcode 6.0: fix member initializer 'mAppearanceSerialNum' does not name a non-static data member or base class - already initialized in parent class llCharacter 2014-10-18 11:34:53 -07:00
callum_linden 327a99a8a8 Update to build on Xcode 6.0: more removal of unused variables and functions 2014-10-18 11:25:07 -07:00
Aura Linden c25a786640 Pulled merge from viewer-tiger 2014-09-19 10:54:55 -07:00
Aura Linden e44dfc0a4e Fix position hiding on failed teleports on mac. 2014-09-08 13:55:23 -07:00
Mnikolenko ProductEngine e8adc1d008 MAINT-4322 FIXED Re-assert DND tag animation if it was cancelled by script, when DND mode is still active 2014-08-26 11:53:57 +03:00
Aura Linden 370aa671c6 Allegedly hides voice position on teleport. Needs testing. 2014-08-15 18:49:54 -07:00
simon 3e6698073c Merge viewer-release and become version 3.7.12 2014-07-07 14:49:45 -07:00
simon bfa42c9e28 Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
Mnikolenko ProductEngine 7932a77319 MAINT-3885 FIXED Don't set focus on avatar after double-click-teleport if camera was locked. 2014-07-01 11:01:43 +03:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
simon 592024b580 Merge viewer-release and become version 3.7.9 2014-06-17 10:40:42 -07:00
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
andreykproductengine 984cc0788d MAINT-3504 FIXED Avatar cannot move after TPing into region he nearly crossed into 2014-05-29 19:19:41 +03:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
andreylproductengine c283a94c0a MAINT-3969 FIXED Animation problems when teleporting while sitting on some objects 2014-04-29 06:36:23 +03:00
simon 00a325ccb9 Pull in viewer-lion to lock down next release 2014-03-19 11:41:42 -07:00
maxim@mnikolenko 09d1c27d4f MAINT-3822 FIXED Show busy mode message only once for each im session. 2014-03-14 12:21:25 +02:00
Oz Linden a5e56067c2 merge changes for 3.7.2-release 2014-03-03 15:36:34 -05:00
Mnikolenko ProductEngine c23aebf89d MAINT-3746 FIXED After replacing LLEnvManagerNew::setRegionChangeCallback with LLAgent::addRegionChangedCallback we should call RegionChanged callbacks to update NavMesh status. 2014-02-26 12:50:43 +02: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