summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-19tag merge of DRTVWR-233Oz Linden
2012-10-19pull back changes from 3.4.1-beta9Oz Linden
2012-10-19Added tag 3.4.1-beta9 for changeset 9c4519aa5c70Oz Linden
2012-10-19tag merge of DRTVWR-231Oz Linden
2012-10-18MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid ↵William Todd Stinson
memory corruption in the case that the new memory size requested is smaller than the old memory size. Also, adding check to ensure that the aligned malloc returns a non-null value before memcopying.
2012-10-18Removing GCC_GENERATE_DEBUGGING_SYMBOLS=NO from xcode projectDon Kjer
2012-10-18Removing -g flag from mac buildsDon Kjer
2012-10-18mergevoidpointer
2012-10-18MAINT-1615 - Something invisible pushes avatars around on Dorevoidpointer
2012-10-18MAINT-1303 FIXED Hide menus and buttons after exiting mouselook if 'Hide all ↵maxim_productengine
controls' is switched on.
2012-10-17Adding '-g' to mac buildsDon Kjer
2012-10-17mergesimon@Simon-PC.lindenlab.com
2012-10-17MAINT-1724 : Viewer crashes while attempt to open '+ inventory' floatersimon@Simon-PC.lindenlab.com
that already opened in separated floater. Changed to non-tearable menu. Reviewed by Kelly
2012-10-17MAINT-1527 Fix for crash on exit when VBO disabledDave Parks
2012-10-17Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-17MAINT-1742 Child object does not update position while selected.Kelly Washington
reviewed with Davep
2012-10-17Update script that generates Google Breakpad symbols to look in tghe right ↵callum_linden
place first and default to the original location if not found.
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-17MAINT-873 Fix for inability to upload meshes on some systems.Dave 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