summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-06revert some LLUnit changes to temporarily fix SH-4399: Interesting: Texture ↵Xiaohong Bao
console MB Bound 0/384 and texture queue bounces once per second
2013-08-05Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2013-08-05CHOP-951, IQA-1477: Validate args for numeric command-line switches.Nat Goodspeed
The logic in llcommandlineparser.cpp's setControlValueCB() callback function for converting command-line switch argument values from string to the actual type of the map-to settings variable had a couple special cases for boolean and LLSD array. But for S32, U32 and F32, it simply used default LLSD string-to-numeric conversion. LLSD's string-to-numeric conversion is a bit lame: for non-numeric strings, it shrugs and returns 0. Introduce onevalue() and badvalue() helper functions that, like certain errors during command-line parsing, throw LLCLPError. Use them to streamline certain redundancies in setControlValueCB(). Introduce convertTo<T>() helper function that uses boost::lexical_cast() for slightly more stringent conversions. Add cases for U32, S32 and F32 targets. setControlValueCB() is actually called only by LLControlGroupCLP::notify(), not during actual command-line parsing. Make LLControlGroupCLP::notify() return bool. Make it catch LLCLPError, set the error for getErrorMessage() and return false on that exception. Package LLAppViewer::initConfiguration()'s response to initParseCommandLine() returning false as a new handleCommandLineError() function; invoke it both there and when LLControlGroupCLP::notify() returns false.
2013-08-05Pull merge from lindenlab/viewer-releaseMerov Linden
2013-08-05fix for SH-4397: Object cache occlusion culling results are not always correctXiaohong Bao
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05correct coding standards problemsOz 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-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-08-01mergeRichard Linden
2013-08-01SH-4374 WIP Interesting: Statistics Object cache hit rate is always 100%Richard Linden
2013-07-31Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-07-31fix for SH-4393: Interesting: viewer crash in LLViewerRegion::addNewObjectXiaohong Bao
2013-07-31fix for SH-4290: Running viewer with SceneLoadingMonitorEnabled causes ↵Xiaohong Bao
viewer to be unresponsive on login on low end machine
2013-07-31cleanup - renamed valueAs to valueInUnits and made it a symmetrical ↵Richard Linden
getter/setter
2013-07-31BUILDFIX: bad argument to llformatRichard Linden
2013-07-31BUIDLFIX: point to fixed build of llappearanceutilitiesRichard Linden
2013-07-31BUIDLFIX: point to fixed build of llappearanceutilitiesRichard Linden
2013-07-31BUILDFIX: bad quotesRichard Linden
2013-07-31Automated merge with https://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-07-31BUILDFIX: removed usage of llversionserver.hRichard Linden
2013-07-31fix some compiling errors.Xiaohong Bao
2013-07-30Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-07-30fix for SH-4297: interesting: viewer-interesting starts loading cached scene ↵Xiaohong Bao
late
2013-07-30mergeRichard Linden
2013-07-30BUILDFIX: some gcc build fixesRichard Linden
2013-07-30BUILDFIX: fixes use of variadic macros for gcc (use ##__VA_ARGS__ to do ↵Richard Linden
comma removal)
2013-07-30Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-07-30more cleanupRichard Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
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-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-29fix for SH-4293: texture console takes a while to settle down on Interesting ↵Xiaohong Bao
viewer.
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-25Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-07-25fix for SH-4298: Interesting: Viewer crash in LLViewerOctreeCull andXiaohong Bao
SH-4341: Interesting: Viewer crash in LLViewerOctreeCull
2013-07-25BUIDLFIX: bad ternary expressionRichard Linden