summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-08-02Pull merge from lindenlab/viewer-fbcMerov Linden
2013-08-02ACME : Fix a spurious crash when showing the Advanced->Shortcuts menu just ↵Merov Linden
after launch
2013-08-02changed facebook_post_success text to be more consistent with other ↵Cho
notification text for ACME-793
2013-08-02changed PLACE to CHECK IN for ACME-794Cho
2013-08-02MAINT-2914 FIXED Mousing over UI elements does not make them light updmitry
2013-08-02MAINT-2902 FIXED Browser secure session indicator should be prominentmaksymsproductengine
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-01ACME-761 : Use the cap for the service url unless overridden by the ↵Merov Linden
SLShareHost setting from settings.xml
2013-08-01Pull merge from lindenlab/viewer-fbcMerov Linden
2013-08-01ACME-785 : Use a specific notifytip message (without the OK button) for fbc ↵Merov Linden
success notification
2013-08-01Merge downstream codesimon
2013-08-01ACME: add SLShareHost variable to settings.xml, which allows changing the fb ↵Gilbert Gonzales
service host location as needed.
2013-08-01NORSPEC-336 fix glow regression from 304 fixGraham Linden
2013-08-01MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"simon
2013-08-01ACME-773 Making cookie clearing occur during disc and connect.Gilbert Gonzales
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-08-01NORSPEC-304 fix glow pass rendering over alpha pass after ALM toggleGraham Madarasz (Graham Linden)
2013-07-31ACME-778: Adjusted the facebook code so that isConnected() does not depend ↵Gilbert Gonzales
on state changes. Instead it returns true if the user successfully connected and false if the user successfully disconnected.
2013-07-31ACME-757: Switching back to pdp15 host for testing.Gilbert Gonzales
2013-07-30Merge downstream codesimon
2013-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
2013-07-30NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehowGraham Linden
2013-07-30merge changes for CHOP-975Oz Linden
2013-07-30ACME-757 : Change the hard coded url to fbc service (still a hack)Merov Linden
2013-07-30NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac ↵Graham Madarasz (Graham Linden)
10.6.8 nV driver issues
2013-07-30get rid of warning generated by trying to save obsolete VersionChannelName ↵Oz Linden
setting
2013-07-29Slowest debug in the west.Aura Linden
2013-07-29I love issues that only reproduce via teamcityAura Linden
2013-07-29NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on MacGraham Madarasz (Graham Linden)
2013-07-29merge changes for maint-2936Oz Linden
2013-07-29merge changes for storm-1838Oz Linden
2013-07-29merge storm-1958Oz Linden
2013-07-29STORM-1838 mergeJonathan Yap
2013-07-29STORM-1838 Add display name handling to the initial notificationJonathan Yap
2013-07-28NORSPEC-314 fixed another mac-specific stupidity by splitting out a new ↵Graham Madarasz
srgb_mac version of the shader
2013-07-28NORSPEC-314 fix the fullbright alpha mask logicGraham Madarasz
2013-07-28STORM-1957 World Map - Land For Sale is missing L$ / sqmJonathan Yap
2013-07-26mergeGilbert Gonzales
2013-07-26ACME-755 Clear FB cookies by removing cookies from the .facebook.com domainGilbert Gonzales
2013-07-26NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering ↵Graham Linden
mac GLSL compiler
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-25ACME-745 : Fix : Do not oversanitize the logged URLs...Merov Linden
2013-07-25ACME-773 Remove the 'Use another account...' in the ACCOUNT panelGilbert Gonzales
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