summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-06Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06merge changes for DRTVWR-223Oz Linden
2012-11-06merge changes for DRTVWR-208Oz Linden
2012-11-06pull back changes from 3.4.2-beta1Oz Linden
2012-11-05STEAM-14: login when user presses Enter at username or password.Nat Goodspeed
The tricky thing about this fix is that the "Log In" button used to be in the same layout_panel as the username and password fields. Now it's not, so the fact that it's the default button for its layout_panel doesn't matter because that layout_panel doesn't have focus. Richard pointed out that we can make the commit action for the username and password fields initiate login -- as long as neither field implicitly runs its commit action when it loses focus!
2012-11-05merge changes for DRTVWR-217Oz Linden
2012-11-05merge up to latest viewer-developmentOz Linden
2012-11-02merge back fixes from 3.4.1-beta12Oz Linden
2012-11-01Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-10-31MAINT-1560 : Make Slow Motion Animations affect all avatars. Added new menu.simon@Simon-PC.lindenlab.com
Reviewed by Kelly
2012-10-31MAINT-646 Fix for leak introduced by optimizations.Dave Parks
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-236Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-29MAINT-1791 : Parcel media clear list crash. Reviewed by Kellysimon@Simon-PC.lindenlab.com
2012-10-26Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-10-26MAINT-1311 Add some logging and assertions to help track down mesh loading ↵Dave Parks
errors.
2012-10-25MergeKelly Washington
2012-10-25MAINT-1275 [SECURITY] Web session tokens saved in SecondLife.logKelly Washington
reviewed with Simon
2012-10-25MAINT-1743 "Use Selection for Grid" does not change the grid ruler to ↵Kelly Washington
"Reference" in the tools floater Reviewed with Simon.
2012-10-23MAINT-1579 Fix for diffuse color being ignored in mesh import preview render.Dave Parks
2012-10-23MAINT-1567 cleanup some gcc warningsDave Parks
2012-10-23Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-10-23MAINT-1567 Fix for incorrect triangle and hull counts in mesh importer.Dave Parks
Reviewed by VoidPointer
2012-10-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-10-23correct faulty mergeOz Linden
2012-10-20Adding expanded searching for symbols during google breakpad symbol scanDon Kjer
2012-10-19pull back changes from 3.4.1-beta9Oz Linden
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-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-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-17Merge in upstream fixessimon@Simon-PC.lindenlab.com
2012-10-17MAINT-643 Cleanup some shader compilation errors when atmospheric shaders ↵Dave Parks
are enabled.
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.