summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-17Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-10-17MAINT-873 Fix for inability to upload meshes on some systems.Dave Parks
2012-10-17Merge in upstream fixessimon@Simon-PC.lindenlab.com
2012-10-17Removing the adult check build configuration as it is no longer required.William Todd Stinson
2012-10-17Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-17MAINT-643 Cleanup some shader compilation errors when atmospheric shaders ↵Dave Parks
are enabled.
2012-10-17Fix angry Linux and Mac buildssimon@Simon-PC.lindenlab.com
2012-10-16Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development.William Todd Stinson
2012-10-16Correcting an error that was being reported during shutdown.William Todd Stinson
2012-10-16MAINT-1737: Removing the visibility check from the rebake navmesh menu ↵William Todd Stinson
option because it is does work well in the case of the torn-off menu mode.
2012-10-16MAINT-1737: Adding a menu option to the Pathfinding menu to allow rebuilding ↵William Todd Stinson
of the region's navmesh.
2012-10-16LLPanelLogin::loadLoginPage() can now use "sourceid" settings var.Nat Goodspeed
Previously we borrowed the sourceid= param value from create_account_url, which we "happened to know" was overridden with the sourceid of interest. Now that we have a settings variable that directly captures sourceid, though, much more straightforward to use that.
2012-10-16Reference new "[sourceid]" substitution in "create_account_url".Nat Goodspeed
join.secondlife.com needs to know the sourceid as well as the user's language of choice. Ensure that sourceid gets passed with the URL.
2012-10-16Steam skin no longer needed: we can now embed "[sourceid]" in URLs.Nat Goodspeed
The whole point of --skin steam was to override (specifically) "create_account_url" in strings.xml, adding to each URL value a sourceid= URL parameter. Now we can do that more simply with '--set sourceid blah'. Less overhead, less maintenance, scales better to potential future sourceid values. Remove the steam skin.
2012-10-16Automated merge with file:///Users/nat/linden/viewer-sourceidNat Goodspeed
2012-10-16MAINT-1737: Moving files around to replace the Rebake_Region button with a ↵William Todd Stinson
menu option.
2012-10-16MAINT-1404 Fix for child objects not appearing to move when editing until ↵Dave Parks
deselecting.
2012-10-16Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-16MAINT-1738: Repositioning the 'Show in linksets' and 'Show in characters' ↵William Todd Stinson
in-world context menu options.
2012-10-16Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-10-16MAINT-643 Fix for incorrect lighting and colors in preview displays.Dave Parks
2012-10-16change to force new build numberOz Linden
2012-10-16Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-16sync with viewer-developmenteli
2012-10-16Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-16Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-16Pull back viewer-development with latest beta mergessimon@Simon-PC.lindenlab.com
2012-10-16Introduce LLAppViewer::initStrings(); reload default_trans_args.Nat Goodspeed
Calling LLTrans::setDefaultArg() after LLTransUtil::parseStrings() is almost good enough -- but it fails to address the case in which one or more of the default_trans_args strings (e.g. "create_account_url") embeds a reference to the new substitution. So after the setDefaultArg() call, go back through default_trans_args, refetching each string to perform the substitution and updating it with a setDefaultArg() call of its own. All this is way too much logic to replicate in both LLAppViewer::initConfiguration() and init(), so break out new LLAppViewer::initStrings() method and call it from both places.
2012-10-16pull back changes from 3.4.1-beta8Oz Linden
2012-10-15Added tag 3.4.1-beta8 for changeset 1dc94555582fOz Linden
2012-10-15tag merge of DRTVWR-228Oz Linden
2012-10-15MAINT-1640: Changing the pathfinding sub-menu to be tear-off.William Todd Stinson
2012-10-15MAINT-1598 Edit Linked Parts isn't returning creator/ownerKelly Washington
* Show creator, owner and group information when only selecting a single prim in a linkset. reviewed with Simon
2012-10-15MAINT-1672: Correcting issue where the sailboat boom was not moving ↵William Todd Stinson
correctly. The isssue was that the display text for the prim was being updated, and this code path would mark the prim as having been moved when, in fact, the pipeline had not yet moved the object.
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-15changed ctor param to use in-process crash generationcallum_linden
2012-10-15MAINT-1721 Fix for crash when clicking "back" button after editing appearance.Dave Parks
Reviewed by VoidPointer
2012-10-15pull back 3.4.1-beta7 fixesOz Linden
2012-10-15Add 'sourceid' settings var specifically for skin-files insertion.Nat Goodspeed
Add logic after (both!) LLTransUtil::parseStrings() calls to ensure that "[sourceid]" embedded in (e.g.) strings.xml content will be replaced.
2012-10-15Remove LLUICtrlFactory::findSkinnedFilename(): cf. LLDir method.Nat Goodspeed
Richard points out that LLUICtrlFactory::findSkinnedFilename() adds little value. It was called from exactly one place, and that one place could easily obtain the information another way. The concern is that it could confuse a reader of the code with regard to the other findSkinnedFilename[s]() methods in LLDir. Clarifying the code base is a Good Thing. Removing.
2012-10-12MAINT-1568 Fix for inconsistent triangle counts when changing LoD sources in ↵Dave Parks
model importer
2012-10-12Added tag 3.4.1-beta7 for changeset 524da902713eOz Linden
2012-10-12merge changes for DRTVWR-227Oz Linden
2012-10-12tag merge of DRTVWR-227Oz Linden
2012-10-12MAINT-1649 Fix for objects disappearing on region crossing.Dave Parks
2012-10-12Fix LLUI::locateSkin() failure case; clarify lldir.cpp static init.Nat Goodspeed
Per code review: Previous refactoring of LLUI::locateSkin() preserved odd failure behavior: it would return last-considered pathname, whether or not it exists. Changed to emit LL_WARNS log message and return empty string. Use Boost.Assign to simplify initialization of a couple static containers in lldir.cpp.
2012-10-12LLUICtrlFactory::getLayeredXMLNode() gets LLDir::ESkinConstraint.Nat Goodspeed
At this point, LLUICtrlFactory::getLayeredXMLNode() is a pretty thin wrapper around LLDir::findSkinnedFilenames() and LLXMLNode::getLayeredXMLNode(). Until now, LLUICtrlFactory::getLayeredXMLNode() passed (by default) LLDir::CURRENT_SKIN to LLDir::findSkinnedFilenames(). But that meant that a caller such as LLTransUtil::parseStrings() that wants almost the same functionality, but with LLDir::ALL_SKINS instead, had to clone the logic from LLUICtrlFactory::getLayeredXMLNode(). Allowing its caller to pass the desired LLDir::ESkinConstraint enum value eliminates the need to clone its logic. Remove cloned logic from LLTransUtil::parseStrings().
2012-10-11MAINT-1684: Correcting the calls to ll_aligned_free() which should have ↵William Todd Stinson
actually been to ll_aligned_free_16().
2012-10-11point to new version of Google Breakpad and tweak function sig of GBP ↵callumprentice
exception handler
2012-10-11Change LLDir::findSkinnedFilenames() to use enum instead of bool.Nat Goodspeed
At Richard's suggestion, changed the bool merge parameter to new enum ESkinConstraint with values CURRENT_SKIN and ALL_SKINS. This clarifies what we're requesting at the point of the call.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 13:08:51 +0000