summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-28merge changes for 3.6.1-releaseOz Linden
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-06-27Merge with viewer-releasecallum_linden
2013-06-27increment viewer version to 3.6.2Oz Linden
2013-06-27CHOP-959: Make settings.xml actually valid XML LLSD.Nat Goodspeed
UserLoginInfo block had <key>Value</key> without the required subsequent element to provide any actual value. This confused at least the Python LLSD reader.
2013-06-27CHOP-955, CHOP-957: Prioritize indra.util.llmanifest in same source repo.Nat Goodspeed
It seems that certain build hosts have an (obsolete? broken?) install of indra.util.llmanifest under the system Python. If we append the local repo indra/lib/python to sys.path, viewer_manifest.py pulls in the broken llmanifest. Prepend to sys.path instead to ensure we get the right one.
2013-06-27CHUI-817 FIX Revealing the "Conversations" window reveals hidden Nearby Chat ↵PavelK ProductEngine
window as well
2013-07-19CHUI-985 POSTPONED [CHUIBUG]User receives three friendship offer ↵maksymsproductengine
notifications simultaneously when he accept/decline friendship offer
2013-07-17CHUI-987 FIXED (Viewer crashes when you try drag and drop any object from ↵Mnikolenko ProductEngine
inventory onto avatar’s name in resident picker)
2013-07-16CHUI-978 FIXED Add Nearby chat history to the list of transcriptions if it ↵Mnikolenko ProductEngine
exists(to enable "Chat history" menu item for Nearby chat)
2013-07-10CHUI-984 FIX Clicking on voice icon no longer brings up voice volume sliderPavelK ProductEngine
2013-07-09CHUI-978 FIXED Load data from chat log file in separate thread to prevent ↵Mnikolenko ProductEngine
viewer freeze
2013-07-08CHUI-982 FIXED Clicking on conversation in conversation list to bring focus ↵maksymsproductengine
to conversation removes text entry prompt for chat bar
2013-07-02Pull merge lindenlab/viewer-releasemaksymsproductengine
2013-06-27CHOP-956: Add settings_install.xml to settings_files.xml.Nat Goodspeed
Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from settings_files.xml.
2013-06-26Added tag 3.6.1-release for changeset 75cf8e855ae1Oz Linden
2013-06-26CHUI-983 FIXED Call showHistory() after clicking toast as it was before. ↵Mnikolenko ProductEngine
Minor change in showHistory()
2013-06-25CHOP-957: Stop looking for, or parsing, Mac arguments.txt file.Nat Goodspeed
2013-06-25CHOP-957: Stop reading gridargs.dat in 'secondlife' wrapper script.Nat Goodspeed
However, for backwards compatibility, continue to recognize and discard --skip-gridargs switch.
2013-06-25merge changes for NORSPEC-280Oz Linden
2013-06-24CHOP-955, CHOP-957: Platform-specific switches files => settings_install.xml.Nat Goodspeed
Instead of generating viewer command-line switch overrides into the Windows shortcut, an arguments.txt file on Mac, or a gridargs.dat file on Linux, generate a platform-independent settings_install.xml file containing 'sourceid' key (if 'sourceid' found in TeamCity environment variables). All command-line override switches previously found in the aforementioned files have happily become moot.
2013-06-24MAINT-2800 revert changes to objectSkinV to make it match 3.6.0 code and not ↵Graham Madarasz (Graham)
slow down on ATI on Mac
2013-06-22mergemberezhnoy
2013-06-22build fixmberezhnoy
2013-06-21NORSPEC-280 Fix for shader compilation error on OpenGL 3.3Dave Parks
2013-06-20Try to track down some bad bounding boxes in particles.Dave Parks
2013-06-20MATBUG-204 Fix for crash in genVolumeBBoxesDave Parks
2013-06-20Merge cleanupDave Parks
2013-06-20CHUI-850 FIXED Unread notifications are lost after relog in certain ↵PavelK ProductEngine
circumstances
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-20CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")mberezhnoy
Fixed "Add friend" option always being greyed out, add ability to block object via context menu in compact chat mode.
2013-06-19merge changes for DRTVWR-326Oz Linden
2013-06-19merge changes for 3.6.0-releaseOz Linden
2013-06-19Merge conflict mixup, use noaction instead of none for user preferenceMerov Linden
2013-06-19NORSPEC-272 make sure the tex filtering fix stays putGraham Linden
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-19Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2013-06-19Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-06-19Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-19Point light color (de)correction.Dave Parks
2013-06-19merge changes for 3.6.0-releaseOz Linden
2013-06-19merge increment of version numberOz Linden
2013-06-19correct 3.6.0-release for last minute fixOz Linden
2013-06-19commit inital tag for 3.6.0-releaseOz Linden
2013-06-18Review cleanupDave Parks
2013-06-18Occlusion culling overhaul.Dave Parks
2013-06-18DRTVWR-324 : Suppress the use of BuildParams to set up the channel and use ↵Merov Linden
the TC environment settings instead
2013-06-18CHUI-979 FIXED Clear highlight after clicking in chat input. Do not flash ↵Mnikolenko ProductEngine
chat button if current conversation is focused and torned off.
2013-06-18correct banding issueOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 20:54:05 +0000