summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-05Pull merge from lindenlab/viewer-releaseMerov Linden
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05correct coding standards problemsOz Linden
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05Merge viewer-release with Vivox codesimon
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05increment viewer version to 3.6.3Oz Linden
2013-08-05Added tag 3.6.2-release for changeset f6741d5fe8d6Oz Linden
2013-08-05open-185: remove duplicate gperftools entry in autobuild.xmlOz Linden
2013-08-02CHOP-959: merge --graphicslevel fix up to tipNat Goodspeed
2013-08-02CHOP-959: Honor --graphicslevel switch even on first viewer run.Nat Goodspeed
Previous CHOP-959 logic set a flag to remember that settings variable RenderQualityPerformance was set (by --graphicslevel), so it could be applied once LLViewerWindow is constructed. But on first viewer run, LLViewerWindow constructor calls LLFeatureManager::applyRecommendedSettings(), which resets that settings variable! So don't just set a flag, actually capture the requested RenderQualityPerformance value for later.
2013-08-01MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"simon
2013-08-01MAINT-2949 : Objects across the sim border do not render when approached. Addedsimon
missing code block from previous change as per Dave P's advice
2013-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
2013-07-30merge changes for CHOP-975Oz Linden
2013-07-30MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer ↵maksymsproductengine
goes blank if location is selected and a menu item is seleted
2013-07-30CHOP-975: Remove fallback to v1.0 update query when the v1.1 gets a 404 responseOz Linden
2013-07-30get rid of warning generated by trying to save obsolete VersionChannelName ↵Oz Linden
setting
2013-07-30Adding a non-code change to force a rebuild of the CHUI RC to avoid CHOP-100Steven Harrison (steven)
2013-07-29Slowest debug in the west.Aura Linden
2013-07-29I love issues that only reproduce via teamcityAura Linden
2013-07-29merge changes for maint-2936Oz Linden
2013-07-29merge changes for storm-1838Oz Linden
2013-07-29Add copyright and licenseJeff (Gioffredo Linden)
2013-07-29merge storm-1958Oz Linden
2013-07-29add credit for storm-1958Oz Linden
2013-07-29STORM-1838 mergeJonathan Yap
2013-07-29STORM-1838 Add display name handling to the initial notificationJonathan Yap
2013-07-28STORM-1957 World Map - Land For Sale is missing L$ / sqmJonathan Yap
2013-07-26CHOP-955: merge viewer_manifest.py file_list fixNat Goodspeed
2013-07-26CHOP-955: Include app_settings/settings_install.xml in file_list.Nat Goodspeed
viewer_manifest.py uses its base-class llmanifest.LLManifest.put_in_file() method to create several different files in the install image being marshalled. I based the logic to create settings_install.xml on that example. Unfortunately I failed to notice that after every existing call, the script also explicitly appended the newly-created file to self.file_list... which only matters on Windows. file_list is fed to the NSIS installer. Change put_in_file() method to implicitly append to self.file_list. Change every existing viewer_manifest.py call to pass new put_in_file(src=) param instead of explicitly appending to self.file_list.
2013-07-26Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951Nat Goodspeed
2013-07-26CHOP-962: merge code-review fixes with viewer-releaseNat Goodspeed
2013-07-26CHOP-962: per code review, comment that other code relies on "Global".Nat Goodspeed
The comment advises grepping for "Global" rather than specifically pointing to llcontrol.cpp because that's NOT the only place that relies on the name "Global"! Besides, by the time someone does want to change the name, still other such dependencies could've crept in.
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
Initial change made LLControlVariable::mPersist an enum, but retained bool/BOOL public API. setPersist(true) set one value, setPersist(false) set another, forcePersist() set the third. Per code review, expose enum to public, make setPersist() (and LLControlVariable constructor, and LLControlGroup:: declareControl(), and all the LLControlGroup::declareMumble() methods, and all the unit-test dummy declareMumble() method bodies) accept that enum. Remove forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly. Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25Kill all the vivox logsAura Linden
2013-07-25Restore VITA LLNotiication APIJeff (Gioffredo Linden)
2013-07-25VITA test framework - record events supportJeff (Gioffredo Linden)
2013-07-24added default sourceid and check that sourceid is not blank, hoping to get ↵JJ Linden
the windows builds to recognize the value
2013-07-24merge up to latest snowstorm integration branchOz Linden
2013-07-24credit Cinder with STORM-1951Oz Linden
2013-07-24Improve envelope notification behavior when there is no toast to displayOz Linden
2013-07-23STORM-1958: Only draw the user's netmap dot onceCinder Roxley
2013-07-23Fix for BUG-3363. We have an array of URLs, and we need the paths of those ↵Geenz
URLs. Explicitly get the path.
2013-07-23Fix for BUG-3364Geenz
2013-07-23CHUI-986 FIXED Don't open Conversation floater for offline IMs if it's not ↵Mnikolenko ProductEngine
from group or friend.
2013-07-22Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-07-22CHOP-962: tag before merging in viewer-releaseNat Goodspeed
2013-07-22Removed tag CHOP-962-aNat Goodspeed
2013-07-22CHOP-962: tag before merging in viewer-releaseNat Goodspeed