summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-11-03mergeJames Cook
2009-11-03Missed the talk_button.xml file add.James Cook
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-03EXT-2093 People inspectors should include an "IM" buttonJames Cook
2009-11-03Removed unneeded layout="topleft" attributes.James Cook
2009-11-03mergeSteve Bennetts
2009-11-03mergeSteve Bennetts
2009-11-03EXT-1345 Convert LLTalkButton to XUI XMLJames Cook
Allows Erica and co to change and localize it. Trivial, not reviewed.
2009-11-03mergeXiaohong Bao
2009-11-03mergeXiaohong Bao
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.xml - missed creditSoft Linden
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-03mergeTofu Linden
2009-11-03mergeTofu Linden
2009-11-03mergeTofu Linden
2009-11-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-03Added .DS_Store to .hgignore and removed the checked in version from the repos.Eric M. Tulla (BigPapi)
It's an OSX image cache file that was accidentally added to the repos. -Reviewed by brad.
2009-11-03Backed out changeset 8d2ba8bb62a5Tofu Linden
2009-11-03Backed out changeset 8bb55c0994a2Tofu Linden
2009-11-03Backed out changeset 30592b61e452Tofu Linden
2009-11-03Backed out changeset 776703433218Tofu Linden
2009-11-03Backed out changeset ba150ce614d0Tofu Linden