summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-17Merge in upstream fixessimon@Simon-PC.lindenlab.com
2012-10-17MAINT-1551 : WIP : More tests to elicit a correct answer from the backbone ↵Merov Linden
server
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-17CHUI-419 FIXED Selecting the drop down arrow to list participants for a ↵maksymsproductengine
conversation does not select that conversation
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-17CHUI-394 FIXED Group moderation tools missing in right click menusmaksymsproductengine
2012-10-16merging in latest changesGilbert Gonzales
2012-10-16Move const kw locationJeff (Gioffredo Linden)
2012-10-16change to force new build numberOz Linden
2012-10-16Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-16Make getValue const to fix Windows builds - and be more robustJeff (Gioffredo Linden)
2012-10-16Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-16sync with viewer-developmenteli
2012-10-16CHUI-380: Realized that the when clicking the participant/conversation item ↵Gilbert Gonzales
that the active session wasn't being stored. This caused the right side conversation floater to not change when selecting a participant under a conersation. Resolution: now when clicking on a conversation or participant the active session is stored using setActiveSession().
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-16CHUI-388 FIXED Do not add menu items to Participant Menu if own avatar is ↵maxim_productengine
selected in participant list. Do not show Menu if all menu items are disabled.
2012-10-15Added tag 3.4.1-beta8 for changeset 1dc94555582fOz Linden
2012-10-15tag merge of DRTVWR-228Oz Linden
2012-10-15MAINT-1551 : WIP : Added a hack : send an accept invitation message so to ↵Merov Linden
trigger the sending of the agent list.
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-15CHUI-380: Bug fix after merge. When selecting the participant of a ↵Gilbert Gonzales
conversation focus would be lost on the converstation floater. This was because focus would be set to the participant folder item. Resolution: Now delegate focus from the particiapnt folder item to the conversation floater.
2012-10-15MAINT-1551 : WIP : MergeMerov Linden
2012-10-15MAINT-1551 : WIP : More IM comm tracing and attempt to fixMerov Linden
2012-10-15CHUI-380: Merge fix, the addConverationListItem API was changedso that it ↵Gilbert Gonzales
does not by default select the new conversation item. Adjusted sessionAdded and sessionVoiceOrImStarted functions to specify that the first item should be selected when calling addConversationListItem().
2012-10-15MAINT-1551 : WIP : Trace IM messaging in and out.Merov Linden
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