summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-11-22Merge server-releasesimon
2013-11-22MAINT-3474 FIXED crash on startup in LLTextureCache::purgeAllTextures(bool) ↵maksymsproductengine
attempting to delete texture cache
2013-11-21Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21increment viewer version to 3.6.12Oz Linden
2013-11-21merge changes for open-196Oz Linden
2013-11-21MAINT-3480 FIXED Duplicated strings are deletedMnikolenko ProductEngine
2013-11-21MAINT-3471 FIXED Set USER_LOCALE when updating item count.Mnikolenko ProductEngine
2013-11-19MAINT-2287 : Fix merge errors when merging viewer-releaseMerov Linden
2013-11-19ACME-3319 : Consolidate Merchant Outboxes when several are present into one ↵Merov Linden
in the right place
2013-11-19STORM-1980 Merge changes Oz made (new way of detecting an agent has changed ↵Jonathan Yap
regions) Modify code to make use of the changed callback
2013-11-19STORM-1980 Minor xml changeJonathan Yap
2013-11-19replace uses of LLEnvManagerNew::setRegionChangeCallback with ↵Oz Linden
LLAgent::addRegionChangedCallback
2013-11-19MAINT-3469 FIXED '\n' is shown in 'Can't divide land' notification instead ↵Mnikolenko ProductEngine
of new string
2013-11-19add documentation to LLAgent::addRegionChangedCallback and improve loggingOz Linden
2013-11-19MAINT-3375 FIXED Do not record visibility change if event logging is ↵Mnikolenko ProductEngine
off(because it kills fps).
2013-11-18Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-18add callbacks to LLAgent for Region and Parcel changesOz Linden
2013-11-18MAINT-3319 : WIP : Introduce a consolidate folder method used for Merchant ↵Merov Linden
Outbox
2013-11-18Code review updates. All comments so far.Monty Brandenberg
2013-11-18add handler for socket.error to fix OPEN-196Oz Linden
2013-11-16STORM-1980 Code cleanup and an attempt to fix a mac/linux compile errorJonathan Yap
2013-11-15MAINT-3320 : Fixed! Inventory panels are not resistant to folder root ↵Merov Linden
deletion, using handle instead of pointer and cleaning things consistently
2013-11-15STORM-1980 Added a floater displaying a countdown timer.Jonathan Yap
Removed most of the previous changes.
2013-11-14STORM-1984: Mousing over UI elements does not make them light upAnsariel
2013-11-14merge changes for open-195Oz Linden
2013-11-13OPEN-195 Cleaned non-UTF8 safe charactersDrake Arconis
2013-11-13MAINT-3320 : WIP : Introduced a cleanOutbox() method to be called on outbox ↵Merov Linden
deletion
2013-11-13correct some male/female shape differencesjeremiah@lindenlab.com
2013-11-13MAINT-3364 (Texture picker highlights the wrong texture when no texture is ↵MaximB ProductEngine
found since CHUI.)
2013-11-12MAINT-3394 : add localization handler for ProblemAddingEstateBanManager messagesimon
2013-11-12MAINT-3397 : add localization handler for EstateManagerFailedllTeleportHome ↵simon
message
2013-11-12STORM-1980/1983 Merge changes to region restart message format made by SimonJonathan Yap
to include region name.
2013-11-12Merge downstream code from viewer-bearsimon
2013-11-12Merge viewer-releasesimon
2013-11-12Merge. Refresh from viewer-release after 3.6.10 releaseMonty Brandenberg
2013-11-12MAINT-3269 FIXED crash in LLMessageSystem::callExceptionFuncmaksymsproductengine
2013-11-12MAINT-3068 FIXED "Request Teleport" menu item is added to context menu.Mnikolenko ProductEngine
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-lionRichard Linden
2013-11-11MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated fieldsRichard Linden
moved viewer information strings into LLAppViewer replaced Help>Report a Bug with direct use of Jira link
2013-11-11MAINT-3320 : WIP : Use handle for elements that'll get deleted under us, ↵Merov Linden
quite a bit of debug spam to clean later
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-12convert dos line endingsmaksymsproductengine
2013-11-12convert dos line endingsmaksymsproductengine
2013-11-11MAINT-3429 remove GeForce hack which is causing issues with auto-alpha masks ↵Graham Madarasz (Graham Linden)
in deferred
2013-11-11merge changes for 3.6.10-releaseOz Linden
2013-11-11merge 3.6.10-releaseOz Linden
2013-11-11convert dos line endingsOz Linden
2013-11-11increment viewer version to 3.6.11Oz Linden