summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-11-26MAINT-3319 : Fix the purge of descendents of a category. Note: the cached ↵Merov Linden
number of descendents is not always reliable
2013-11-26merge changes for storm-1984Oz Linden
2013-11-26MAINT-3489: Gracefully handle missing downloaded installer file.Nat Goodspeed
If a marker file indicates that an installer has been downloaded and verified and is ready to install, but that installer file does not exist, log it and revert to checking for update. Also add logging to every code path that can remove the installer explicitly, in case the missing installer is actually being killed off by some weird sequence of state-machine transitions.
2013-11-26merge fix for STORM-1984Oz Linden
2013-11-26remove excessively complex fixes for MAINT-2914 and MAINT-3142Oz Linden
2013-11-26ACME-3320 : Clearing deleted categories so not to pool on them foreverMerov Linden
2013-11-26STORM-1981 Eliminate beam spreadingJonathan Yap
2013-11-26MAINT-3489: Make Mac updater script detect prematurely deleted .dmg.Nat Goodspeed
Also, delete it when done.
2013-11-25MAINT-3320 : Make inbox (Received Items) more resilients to deletion while ↵Merov Linden
we're at it
2013-11-25remove obsolete INSTFLAGS references from installerOz Linden
2013-11-25Merge last changes for DRTVWR-345simon
2013-11-25STORM-1981 Make pulse operate properly in both directions.Jonathan Yap
Move duplicated common code into its own function.
2013-11-25mergeMaximB ProductEngine
2013-11-25MAINT-3499 FIXED Region Debug Console is broken after resizemaksymsproductengine
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-25Merge - doh!simon
2013-11-24STORM-1981 Rough initial changes for evaluation purposes.Jonathan Yap
2013-11-24move setting default grid to settings_install.xml so that it works on all ↵Oz Linden
platforms
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-11-22ACME-1219 : Fix crash on exit on Windows 7merov
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