Commit Graph

29022 Commits (f878b032e8c96c4e4ae752864d7641bba2ea4102)

Author SHA1 Message Date
Don Kjer f878b032e8 Using transaction_id instead of raw asset_id during aisv3 patch 2013-09-09 13:13:22 -07:00
Brad Payne (Vir Linden) 144eb1912d merge 2013-09-04 13:41:51 -04:00
Nyx Linden cda8a75dd6 merge 2013-08-30 19:05:58 -04:00
Nyx Linden 726a26d4bc SH-4458 FIX "Pant flares rendering as tights after SSA rollout"
probably not related to SSA rollout, but we were not triggering the
callbacks for baked texture loads, since the avatar object was adding
paused callbacks to the callback list without properly setting the
flag to indicate paused callbacks.
2013-08-30 19:05:23 -04:00
Brad Payne (Vir Linden) 497e84202e SH-4456 FIX - added info to metrics for viewer version tags. 2013-08-30 11:14:17 -04:00
Brad Payne (Vir Linden) f426f8a694 SH-4455 WIP - versioned some metrics whose usage has changed, added name and item id checks in setWearableOutfit() 2013-08-29 17:08:30 -04:00
Brad Payne (Vir Linden) 3a0cd466f1 SH-4455 WIP - restrict use of LLWearableHoldingPattern metrics. When changing wearables, bail out if current wearables already match those requested. 2013-08-29 14:59:40 -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
Brad Payne (Vir Linden) a3b1a60ed7 merge 2013-08-22 16:12: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
Brad Payne (Vir Linden) 0094c4299f moved LLTrackPhaseWrapper to do its work in destructor 2013-08-19 14:49:11 -04:00
Nyx Linden cc999b225e merge cleanup, making sure our branch has the latest autobuild changes. 2013-08-19 11:55:49 -04:00
Nyx Linden f669fdaf81 merge cleanup - one file did not merge cleanly. 2013-08-16 19:47:58 -04:00
Nyx Linden 2c99777942 merge 2013-08-16 19:31:36 -04:00
Nyx Linden 5ae117aff6 merge with viewer-release 2013-08-16 19:31:16 -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
Brad Payne (Vir Linden) 2157cf5e71 SH-4422 FIX - fixed some recently introduced issues with link description fields, which among other things reduces the number of appearance requests sent. 2013-08-14 14:25:22 -04: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
Brad Payne (Vir Linden) 4961ee03c7 merge 2013-08-12 13:46:25 -04:00
Brad Payne (Vir Linden) 6128cd9f70 cat version debug statement 2013-08-12 13:45:51 -04:00
Don Kjer 8abd6ed6b8 Automated merge. 2013-08-09 14:53:22 -07:00
Don Kjer c1af1a692a Routing link creating through AISv3 when available. 2013-08-09 14:52:54 -07:00
Don Kjer 3ed3b88892 Refactoring link creation calls in preparation for adding AIS v3 hook. 2013-08-09 13:36:36 -07:00
Logan Dethrow 8f05828038 Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internal 2013-08-08 17:13:59 -04:00
Logan Dethrow 0e8a966f3b Moved commented out capabilities debugging code into ifdef'd block and added a comment describing the use of it. 2013-08-08 17:13:53 -04:00
Nyx Linden faa0866ca3 SH-4401 FIX back-end changes to handle new visual param groups. 2013-08-08 13:21:18 -04:00
Oz Linden 86b4019684 merge changes for DRTVWR-333 2013-08-07 12:17:39 -04:00
prep@lindenlab.com 8b612cab39 Fixes for SH-4321. Also removed some unnecessary transform updates, and unused joint resetting code 2013-08-06 16:44:01 -05: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
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