summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-27increment viewer version to 3.6.2Oz Linden
2013-06-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
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-27Added license headers.Geenz
2013-06-27Fix for down key presses not opening up the IME character selection window, ↵Geenz
and inadvertently being handled while marked text is selected.
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-27Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-06-27SH-4299 WIP: Interesting: High fps shown temporarily off scale in statistics ↵Richard Linden
console fixed some lltrace logic errors more consistent syncing of timestamps of sample values in recording stack selection of primary buffers was completely incorrect assignment of recordings got wrong play state due to implicit operator = defined in base class fixed asset stats only working up to the first send
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26MATBUG-194 Fix for crazy colors on projector shadows with NVIDIA OpenGL 3.3 ↵Dave Parks
implementations
2013-06-26more fix for SH-4284: interesting: viewer does not render cacheable objects ↵Xiaohong Bao
on far corner of region when camera moves
2013-06-26Merge vwr-dev-matGraham Madarasz (Graham)
2013-06-26Remove patch fileGraham Madarasz (Graham)
2013-06-26Added tag 3.6.1-release for changeset 75cf8e855ae1Oz Linden
2013-06-26Merge cleanup.Dave Parks
2013-06-26Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366Dave Parks
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26NORSPEC-290 Allow shader compiler to unroll loop in multiPointLightFDave Parks
2013-06-26CHUI-983 FIXED Call showHistory() after clicking toast as it was before. ↵Mnikolenko ProductEngine
Minor change in showHistory()
2013-06-26NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if availableOz Linden
2013-06-25fix for SH-4284: interesting: viewer does not render cacheable objects on ↵Xiaohong Bao
far corner of region when camera moves
2013-06-25Merge vwr-dev-matGraham Linden
2013-06-25NORSPEC-288 remove unassertable asserts from restoring code to condition ↵Graham Linden
normals for this fix
2013-06-25MATBUG-78 Fix for alpha lighting falloff not matching opaque lighting ↵Dave Parks
falloff (again).
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-25merge changes for NORSPEC-280Oz Linden
2013-06-25NORSPEC-288 WIP fixes the issue with normal gen, but may be a bigger perf ↵Graham Linden
hit than we want
2013-06-25NORSPEC-250 add setting to force higher LUT precision and made LUT cleanup ↵Graham Linden
match creation
2013-06-25Merge vwr-dev-matGraham Linden
2013-06-24Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-06-24fix for SH-4264: interesting: Content near edges of screen does not loadXiaohong Bao
2013-06-24MergeGraham Linden
2013-06-24NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sourcesGraham Linden
2013-06-24Automated merge with https://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-06-24SH-4242 FIX interesting: Mac viewer crashes on exitRichard Linden
made notifications subsystem touch instancetracker<notificationchannel> in constructor so that teardown order is preserved
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-24merge changes for DRTVWR-326 3.6.1-beta1Oz Linden
2013-06-24Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao