summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-07-02Dos-to-unix line ending conversion.Monty Brandenberg
2012-07-02Merge 3.3.3 release with Drano HTTP library at 3.3.0Monty Brandenberg
Big delta was converting the new texture debugger support code to the new library. Viewer manifest should probably get an eyeball before release.
2012-07-02merge back changes from 3.3.4-beta2Oz Linden
2012-07-02improve logging of invalid grid definitions, prevent clashes with old viewersOz Linden
2012-07-02CHUI-172 WIP Fixed drawing the nearby chat toast contents.Seth ProductEngine
Fixed warnings when creating a nearby chat toast.
2012-07-02disable alignment tests in debug builds (where they fail)Oz Linden
2012-07-02CHUI-103 FIXED (Implement changes to compact chat view) Change colorationAlexanderP ProductEngine
2012-06-29Ensuring that the code and tests build correctly when HACKED_GODLIKE_VIEWER ↵Todd Stinson
is defined.
2012-06-29PATH-797: BUGFIX Altering how the rows are being added to the scrolllist ↵Todd Stinson
widget to avoid a regression that occurred after merging from viewer-release recently caused the time to load a large number of elements to increase substainally.
2012-06-29CHUI-101 WIP Make LLFolderView general purposeRichard Linden
cleaned up some stale TODOs worked on getting initial inventory display to work consistently
2012-06-29Added test back in, skip() call need to be removed.simon@Simon-PC.lindenlab.com
2012-06-29Merge simon/viewmaster-merge for latest maint worksimon@Simon-PC.lindenlab.com
2012-06-29merge changes for DRTVWR-174Oz Linden
2012-06-29Fix --skin command-line switch by mapping to the correct var name.Nat Goodspeed
It said it mapped to 'SkinFolder', which doesn't exist. 'SkinCurrent' is correct.
2012-06-29Specialize Steam skin by adding sourceid= to join.secondlife.com URL.Nat Goodspeed
Of course, preserve lang= localization from default skin. Assume that localized steam/xui/*/strings.xml file without create_account_url key will default to create_account_url key from steam/xui/en/strings.xml. That's how it works in the default skin, anyway.
2012-06-29Add 'steam' skin, initially only strings.xml, identical to default.Nat Goodspeed
Splitting the 'add' from modifications unique to this skin facilitates code review.
2012-06-29Make Russian and Turkish viewers link to join.secondlife.com lang=.Nat Goodspeed
We have appropriate translations of the join.secondlife.com registration path, but the Russian and Turkish [create_account_url] strings in strings.xml didn't specify them. At Eli's request, added lang= params to these two.
2012-06-29Use [create_account_url] from strings.xml consistently in notifications.xml.Nat Goodspeed
The URL whose simple form is http://join.secondlife.com actually appears in a number of places in the localized notifications.xml files. It's supposed to be localized for the current viewer language -- and in strings.xml, it is. But the same URL is restated a couple times in notifications.xml, sometimes localized, sometimes not. Add "create_account_url" to init_default_trans_args(), permitting us to embed [create_account_url] anywhere in the skin files. Then replace all known occurrences of that URL in notifications.xml files with [create_account_url].
2012-06-29Merge with viewer-betacallum
2012-06-29CHUI-101 WIP Make LLFolderView general purposeRichard Linden
fixed build
2012-06-28CHUI-101 WIP Make LLFolderview general purposeRichard Linden
cleaned up ownership of viewmodel more filtering fixes
2012-06-28CHUI-101 WIP Make LLFolderview general purposeRichard Linden
filtering mostly working
2012-06-28Ensuring that the Show in Linksets and Show in Characters right-click menu ↵Todd Stinson
option is only show on pathfinding-enabled regions.
2012-06-28Ensuring that the linksets filters are cleared before attempting to select ↵Todd Stinson
an object from right-click in-world menu.
2012-06-28Removing the SERVER_SIDE_OWNER_ROLLOUT_COMPLETE ifdef.Todd Stinson
2012-06-28Merge cleanupDave Parks
2012-06-28Cleaning up new files in preparation for merge into viewer-release.Todd Stinson
2012-06-28Remove redundant "create_account_url" string from panel_login.xml.Nat Goodspeed
We already have a "create_account_url" string in strings.xml, and in fact -- according to Eli -- the strings.xml values are "better" for non-English languages. Unfortunately those "better" strings weren't being used. They were tied to the FirstRun notification, which seems to have been disengaged. Changed llpanellogin.cpp to look in strings.xml rather than panel_login.xml when clicking the "Sign Up" link on the login panel.
2012-06-28MergeDave Parks
2012-06-28mergeDave Parks
2012-06-28MAINT-678 Fix for inconsistent data in physics shape displayDave Parks
2012-06-28mergeDave Parks
2012-06-28mergeDave Parks
2012-06-28merge up to 3.3.3-releaseOz Linden
2012-06-28CHUI-168 FIXED, CHUI-183 FIXED Supress of a resizable and dragging and hide ↵AlexanderP ProductEngine
a title for the docked floater
2012-06-29CHUI-164 : Fix conversation list index using handle to floater rather than ↵Merov Linden
uuid. Simplify the code accordingly (suppress hacks).
2012-06-29CHUI-164 : Fix crash when removing ad-hoc conversation. Turns out that ↵Merov Linden
sessions uuids are not constant so I shouldn't use them as index in the conversation list. More complete fix to follow.
2012-06-28Pull merge from richard/viewer-chuiMerov Linden
2012-06-28CHUI-82 : Fixed all icons to use the new Conv_*.png icons; please use those ↵Merov Linden
in the new UIs moving forward
2012-06-28Merge pull in richard/viewer-chuiMerov Linden
2012-06-27CHUI-101 WIP Make LLFolderView general purposeRichard Linden
fixed crash on startup
2012-06-27CHUI-101 WIP Make LLFolderView general purposeRichard Linden
moved filtering logic to viewmodel
2012-06-27Removing unreferenced methods from the LLRenderNavPrim class.Todd Stinson
2012-06-27CHUI-184 : Change default pref LetterKeysFocusChatBar from 1 (chat) to 0 ↵Merov Linden
(WASD movements)
2012-06-27CHUI-146 : Fixed. Focus goes to first conversation in list when a ↵Merov Linden
conversation is dismissed.
2012-06-27MAINT-889 Viewer Group Invitation picker needs to limit to 100 residentsKelly Washington
Requests to invite more than 100 agents at a time are blocked. reviewed with Simon.
2012-06-27CHUI-162 : Simplified the nearby chat show method following CHUI-139 fixesMerov Linden
2012-06-27Pull merge from richard/viewer-chuiMerov Linden
2012-06-27CHUI-130 : Leave minimized torn off IM untouched when showing hiding the ↵Merov Linden
whole set of conversations
2012-06-27MAINT-1204 Fix for crash on selecting a texture anywhere other than the ↵Dave Parks
build tools.