summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-11-03mergeJames Cook
2009-11-03Clean up login panel XML and code.James Cook
Kill dead "web based login" viewer-auth mWebLoginKey. Port over my reg-in-client code from svn, off by default. Reviewed with Ambroff.
2009-11-03update from viewer2 and merge into avpEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-03mergeJames Cook
2009-11-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-11-03Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/Justin C. Rounds (Chuck)
2009-11-03DEV-41358 DEV-41361: Added support for secondlife:///app/worldmapLynx Linden
SLurls to the LLUrlRegistry. These are now displayed with the more human-readable label of "Show Map for XXXX" and sport a context menu with various operations. I also added "Show on Map" options to the context menus for other location-based SLurls. I also internationalized the text for "Teleport to" and the new "Show Map for" strings.
2009-11-03"Uncrammed" the layout.Justin C. Rounds (Chuck)
http://jira.secondlife.com/browse/EXT-1974 http://jira.secondlife.com/browse/EXT-1580
2009-11-03mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-03EXT-2131 : object properties sidepanelLoren Shih
EXT-2128 : remove multi-properties ability, disable from inventory menu Also includes llsidepanelinventory cleanup. --HG-- branch : avatar-pipeline
2009-11-03Automated merge with ssh://lis@hg.lindenlab.com/viewer/viewer-2-0/Lis Pardi
2009-11-03Ext-1766 about land --> object page titles crammedLis Pardi
2009-11-03Removed declared but never defined function, which was causing a build ↵Brad Payne (Vir Linden)
failure on Mac --HG-- branch : avatar-pipeline
2009-11-03ext-1468 move "bubble" chat color from prefs > chat to prefs > advancedLis Pardi
2009-11-03Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-03Added missing llinventorypanel files from previous checkin.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-03Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-03For EXT-1591: Current Outfit Folder contains duplicate attachment items ↵Brad Payne (Vir Linden)
after relog. --HG-- branch : avatar-pipeline
2009-11-03DEV-41358 DEV-41361: Added support for new SLAPP URLs, needed for theLynx Linden
new Search web pages. These are: secondlife:///app/worldmap/{NAME}/{COORDS} Show the given coordinate on the World Map secondlife:///app/agent/{UUID}/pay Pay the specified Resident secondlife:///app/agent/{UUID}/im IM the specified Resident secondlife:///app/agent/{UUID}/requestfriend Request friendship of the specificed Resident secondlife:///app/agent/{UUID}/offerteleport Offer to Teleport the specified Resident secondlife:///app/agent/{UUID}/mute Mute/Block Resident secondlife:///app/agent/{UUID}/unmute Unmute/Unblock Resident
2009-11-03mergeTofu Linden
2009-11-03mergeTofu Linden
2009-11-03Backed out changeset 8d2ba8bb62a5Tofu Linden
2009-11-03Backed out changeset 8bb55c0994a2Tofu Linden
2009-11-03Backed out changeset ba150ce614d0Tofu Linden
2009-11-03mergeTofu Linden
2009-11-03trivial comment change #3Tofu Linden
2009-11-03trivial whitespace change #1Tofu Linden
2009-11-03trivial whitespace change #2Tofu Linden
2009-11-03Trivial whitespace change to test mercurial process with tofu and soft.lynx@eniac45.lindenlab.com
2009-11-03mergedLynx Linden
2009-11-03DEV-39999: Removed all legacy help buttons and notifications from theLynx Linden
code. All help should now go through the new help server, via the Help Browser floater. There should no longer be any custom "?" buttons in the UI - all <button> and <notification> XUI references relating to custom help buttons have been expunged. (I previously extracted all of the help strings from notifications.xml and passed these to the doc team to include in the help server pages.) I have checked that none of the XUI elements that are removed here are still referenced by any C++ code. I've also confirmed that there are no new notifications removed that I have not already passed on to the doc team. And I've also done a pass through the UI to make sure that all of the floaters still look as they should. Finally, I've confirmed that the new help system for floaters and side panels still works. 2,276 lines deleted - 0 lines added.
2009-11-02Add missing eol at eofCG Linden
2009-11-03mergeangela
2009-11-03merge + EXT-1926 I18N: the folder name Contents in Build tools > Contents ↵angela
wont honor its translation + EXT-648 Cannot edit an object you are sitting on
2009-11-02Changed the operation of the "mute all" button in the nearby media floater ↵Monroe Linden
to be closer to spec-compliant, per a design discussion this afternoon.
2009-11-02EXT-1803 Fix group inspectors closing before you can see them if you can't ↵James Cook
join the group. Focus issue -- the inspector had no focusable widgets in that case. Reviewed with Richard.
2009-11-02merge from remote repoRick Pasetto
2009-11-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-02Fix for EXT-894: upload anim preview was using bad texture data instead of grey.Eric M. Tulla (BigPapi)
Switched rendering of dummy mesh for previews (anim, etc) to use default image, instead of default avatar image. -Reviewed by nyx
2009-11-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-11-02EXT-1588: Remove support for automatic hyperlinking of URLs inLynx Linden
notecards until this issue can be addressed correctly. The best solution would be to implement support for alternative display strings for URL text segments. That way, the raw text will contain the original URL string, but we can show a display-only alternate label for the URL. Until I get round to doing this, I'm turning off URL hyperlinking in notecards to avoid the potential for data loss.
2009-11-02Make the "default hover controls" be the "authored" controlsRick Pasetto
(and I made a debug setting that can override this)
2009-11-02MainInventory aesthetic fixes.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02Added hand-cursor to clickable text boxes, fixed hover_color warnings for ↵James Cook
login screen. Reviewed with Richard.
2009-11-02mergeLeyla Farazha
2009-11-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Erica
2009-11-02Merge commit.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02mergeypantsErica
2009-11-02Main Inventory Panel layout fixes.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02Removed tabs. Fixed errant 'else(APPLE)'Mark Palange (Mani)