Commit Graph

28880 Commits (996ed16fa1b3eb005c90b67f8ea363fd423ef711)

Author SHA1 Message Date
eli 996ed16fa1 FIX INTL-123 translation of Viewer Set36 for 9 languages (changed and new files) 2013-09-11 15:15:34 -07:00
Oz Linden 55ae6a7962 increment viewer version to 3.6.6 2013-09-09 14:47:01 -04:00
Oz Linden 938e201d8f Added tag 3.6.5-release for changeset bf6d45304601 2013-09-09 14:45:03 -04:00
Oz Linden a359d9d80c merge changes for 3.6.4-release 2013-08-27 10:37:02 -04:00
Oz Linden 6e1138585b increment viewer version to 3.6.5 2013-08-26 14:55:37 -04:00
Oz Linden 08f5d3d7c0 Added tag 3.6.4-release for changeset 91ed595b716f 2013-08-26 14:52:03 -04:00
Graham Madarasz (Graham Linden) f46e07c14c MAINT-1453 ifdef around windows-only work-around to restore 8x and 16x AA modes on Mac 2013-08-26 10:16:11 -07:00
Oz Linden 70cacc4d17 merge changes for 3.6.3-release 2013-08-19 15:51:40 -04:00
Oz Linden 82bf4e4db2 merge changes for DRTVWR-285 2013-08-19 15:15:15 -04:00
Oz Linden 731fe3e7c6 merge changes for 3.6.3-release 2013-08-19 15:14:23 -04:00
Oz Linden 171089207b increment viewer version to 3.6.4 2013-08-19 14:51:04 -04:00
Oz Linden 739327bb02 Added tag 3.6.3-release for changeset fe4f7c5e9fd2 2013-08-19 14:50:38 -04:00
maksymsproductengine 53eff025bc MAINT-2938 FIXED [CHUI] crash in LLFloaterConversationPreview::showHistory() 2013-08-15 20:24:02 +03:00
Mnikolenko ProductEngine 22140012c2 MAINT-3012 FIXED Don't show Destination Guide by default on first run. 2013-08-15 12:37:24 +03:00
Nicky e7bc0e6e63 BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars. 2013-08-14 01:00:41 +02:00
maksymsproductengine 6505ddb204 MAINT-2937 FIXED [CHUI] crash in LLToastIMPanel 2013-08-13 20:25:49 +03:00
Oz Linden 86b4019684 merge changes for DRTVWR-333 2013-08-07 12:17:39 -04:00
Nat Goodspeed f4943bb2e6 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2013-08-05 19:44:12 -04:00
Nat Goodspeed 7f6e7fc0cb CHOP-951, IQA-1477: Validate args for numeric command-line switches.
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-05 19:43:06 -04:00
Merov Linden f6c7b7ac76 Pull merge from lindenlab/viewer-release 2013-08-05 14:11:52 -07:00
Oz Linden 561e0bb1a0 merge changes for 3.6.2-release 2013-08-05 15:39:49 -04:00
Oz Linden efba897e45 correct coding standards problems 2013-08-05 15:38:43 -04:00
simon b50f54db59 Merge viewer-release with Vivox code 2013-08-05 12:03:00 -07:00
Oz Linden cfd80c02c3 merge changes for 3.6.2-release 2013-08-05 14:44:08 -04:00
Oz Linden 32b8d398ec increment viewer version to 3.6.3 2013-08-05 14:42:37 -04:00
Oz Linden c14ce46669 Added tag 3.6.2-release for changeset f6741d5fe8d6 2013-08-05 14:41:38 -04:00
Nat Goodspeed acda43ed38 CHOP-959: merge --graphicslevel fix up to tip 2013-08-02 10:51:11 -04:00
Nat Goodspeed 32a953f65e CHOP-959: Honor --graphicslevel switch even on first viewer run.
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-02 10:50:19 -04:00
simon 570884d730 MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner" 2013-08-01 12:46:14 -07:00
simon 440e576f86 MAINT-2949 : Objects across the sim border do not render when approached. Added
missing code block from previous change as per Dave P's advice
2013-08-01 11:38:17 -07:00
simon 6db14e3988 MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexes
bullet-proof.  Reviewed by Kelly
2013-07-30 15:12:02 -07:00
maksymsproductengine 152d76e13e MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer goes blank if location is selected and a menu item is seleted 2013-07-30 20:03:21 +03:00
Steven Harrison (steven) 344c42cc3f Adding a non-code change to force a rebuild of the CHUI RC to avoid CHOP-100 2013-07-30 15:17:02 +00:00
Aura Linden f48fedf84e Slowest debug in the west. 2013-07-29 21:45:51 -07:00
Aura Linden 8f5e2cd839 I love issues that only reproduce via teamcity 2013-07-29 19:16:00 -07:00
Nat Goodspeed 0906d000b3 CHOP-955: merge viewer_manifest.py file_list fix 2013-07-26 10:42:58 -04:00
Nat Goodspeed a207b24d33 CHOP-955: Include app_settings/settings_install.xml in file_list.
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-26 10:42:13 -04:00
Nat Goodspeed 1bcce503a9 Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951 2013-07-26 09:00:01 -04:00
Nat Goodspeed f7cdbb2582 CHOP-962: merge code-review fixes with viewer-release 2013-07-26 08:59:37 -04:00
Nat Goodspeed c109361861 CHOP-962: per code review, comment that other code relies on "Global".
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-26 08:58:47 -04:00
Nat Goodspeed d2386652f8 CHOP-962: Make LLControlVariable::setPersist() accept only enum.
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-25 16:46:51 -04:00
Aura Linden 7530e801f4 Kill all the vivox logs 2013-07-25 13:42:36 -07:00
JJ Linden 10c8fbbedb added default sourceid and check that sourceid is not blank, hoping to get the windows builds to recognize the value 2013-07-24 14:38:23 -07:00
Oz Linden 9f393c1d99 merge up to latest snowstorm integration branch 2013-07-24 14:40:23 -04:00
Geenz 3c336c0f36 Fix for BUG-3363. We have an array of URLs, and we need the paths of those URLs. Explicitly get the path. 2013-07-23 10:56:59 -04:00
Geenz 6ca0bbe336 Fix for BUG-3364 2013-07-23 10:39:32 -04:00
Mnikolenko ProductEngine 9da176181a CHUI-986 FIXED Don't open Conversation floater for offline IMs if it's not from group or friend. 2013-07-23 14:02:50 +03:00
Nat Goodspeed 39bd14f3ca Automated merge with http://hg.secondlife.com/viewer-release 2013-07-22 22:24:32 -04:00
Nat Goodspeed e121f3f409 CHOP-962: tag before merging in viewer-release 2013-07-22 22:23:24 -04:00
Nat Goodspeed af90459aa9 Removed tag CHOP-962-a 2013-07-22 22:23:16 -04:00