summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-11-03Fix unposted bug: potential incorrect contract in LLMediaEntry::asLLSD(LLSD& sd)Rick Pasetto
Review #26 Callum found this potential bug in LLMediaEntry::asLLSD(LLSD&). It does not erase the incoming LLSD's WHITELIST_KEY. Every other key is overwritten in this manner, but for the WHITELIST_KEY it is just appended. Note that this is in code common to the server...but I do not believe at this point that there is a bug exhibited by this. Added unit test to test for this case.
2009-11-03mergeSteve Bennetts
2009-11-03mergeSteve Bennetts
2009-11-03mergeJames Cook
2009-11-03EXT-1865 Can now set objects for sale for L$0James Cook
Trivial XUI mistake, not reviewed
2009-11-03mergeLeyla Farazha
2009-11-03fixing de dotLeyla Farazha
2009-11-03mergeJames Cook
2009-11-03Fixed strings to use our preferred <string> instead of <floater.string>James Cook
2009-11-03DEV-37978 VWR-8617: Missing / incorrect keywords TEXTURE_MEDIA and ↵Soft Linden
TEXTURE_DEFAULT
2009-11-03DEV-41348 SNOW-278 Clean up mime_types.xmlSoft Linden
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-03For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]Loren Shih
svn merge -r136068:136089 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 Infrastructure changes for cleaning up Asset/Folder types. Associated sim changes are only so that the sim still compiles.
2009-11-02merge from remote repoRick Pasetto
2009-11-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 04:09:18 +0000