summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-22storm-1831 Replacing old hack with an ENUM check.Ima Mechanique
2013-11-21Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-21storm-1831 Fixing message string UUID assignmentIma Mechanique
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21storm-1831 Cleaning up colour LLSD processing code which is no longer used ↵Ima Mechanique
as colours come from the colors XML file.
2013-11-21storm-1831 Cleaning up output messages SyntaxLSL.Ima Mechanique
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21increment viewer version to 3.6.12Oz Linden
2013-11-21Added tag 3.6.11-release for changeset 2feb70a4cfdeOz 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-21storm-1831 Removing am uneccessary message.Ima Mechanique
2013-11-21storm-1831 Replacing old region changed callback setup with the shiny new one.niel@mint-32
2013-11-20storm-1831 Expanding/fixing copyright headerniel@mint-32
2013-11-20Mergeniel@mint-32
2013-11-20STORM-68 Added default clause to switch statement to try to fix linux ↵Jonathan Yap
compile error.
2013-11-20STORM-68 Reapply changes to inventory processing lost in the merge.Jonathan Yap
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-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-19merge up to 3.6.10-release; some of the storm-68 changes lostOz Linden
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-68 Place initial call to send cap in new, better location.Jonathan Yap
Make processing of debug setting names a little more elegant.
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-18merge changes for STORM-1831Oz Linden
2013-11-18add license headerOz Linden
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-18correct attribution for open-195Oz Linden
2013-11-16Cleanup of output messages. Converting most of the LL_WARNS to LL_INFOS, now ↵Ima Mechanique
testing is done.
2013-11-16STORM-1980 Code cleanup and an attempt to fix a mac/linux compile errorJonathan Yap