summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-11-04Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-04Fix for EXT-2050 - Duplicate entries in strings.xmlEric M. Tulla (BigPapi)
Removed all duplicates (verifying their dupe status and removing the second example).
2009-11-04Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-04Remove existing wearables of a type when putting on new ones. This will ↵Brad Payne (Vir Linden)
need to be revisited when we go to multi-wearables.
2009-11-04Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-04Fix for EXT-2086 & EXT-2087 - No Make Outfit button & Save As behaving as ↵Eric M. Tulla (BigPapi)
make outfit. Created a dedicated make outfit button, and made save as go back to saving a copy of the current wearable. -Reviewed by nyx
2009-11-04Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2009-11-04DEV-41358: corrected a minor typo in a comment and refactored someLynx Linden
code to avoid duplication.
2009-11-04Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-11-04DEV-41358 DEV-41362: Get an authentication token from login.cgi andLynx Linden
pass this token through to the search web pages via a q= query parameter in the search URL. This will let the search facility determine the user's maturity and teen settings. I also now escape the search string that the user typed in, 'cos they could type anything. Thanks to Mani for showing me how to get responses from login.cgi.
2009-11-04mergeangela
2009-11-03Clean up menu_login.xml debug menuJames Cook
Strip out unnecessary layout=topleft Add debug option for reg in client Trivial, not reviewed.
2009-11-04mergreangela
2009-11-03mergeXiaohong Bao
2009-11-03merge fixes. Includes a refactoring of LLParticipantList to fix compile ↵Steve Bennetts
errors on Windows.
2009-11-04mergeangela
2009-11-03fix the bug that textuer boost level is mixed with boolean numbers.Xiaohong Bao
2009-11-03merge from https://hg.aws.productengine.com/secondlife/viewer-2-0/Steve Bennetts
2009-11-03EXT-2062 UI of Notice accordion in the Group Profile panel is corrupted, ↵Erica
EXT-1528 Widen groups content to match new sidebar width
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-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-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
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-03EXT-2141 baked texture not keyed on version #Nyx (Neal Orman)
We actually already have this, stored in our baked texture dictionary. Generated new UUIDs for the baked texture hashes - this will ensure that new baked textures will be generated when users switch to viewer-2, and should clear up the invisibility issues people see from old 1.22 bakes being used as alpha-enabled. Code reviewed by Bigpapi
2009-11-03Fixed normal bug EXT-2150 (IM Floaters should display their title in CAPS ↵Sergey Borushevsky
(p2p, group, ad-hoc)). --HG-- branch : product-engine
2009-11-03update from viewer2 and merge into avpEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-03DEV-1186 possibly typo in avatar_lad.xmlNyx (Neal Orman)
bumped wearable definition number and fixed minor typo in avatar_lad.xml - fix submitted by external contributor. Verified the change is correct and gave credit - change is de minimis, but we haven't caught this/noticed on our own for a while. Code reviewed by Bigpapi
2009-11-03Implemented major sub-task EXT-2140 (Avatar icon in p2p should take all ↵Eugene Mutavchi
available space on Control Panel) --HG-- branch : product-engine
2009-11-03fixed minor bug EXT-1618 Add Landmark does nothing if resident stands ↵Denis Serdjuk
exactly in the location of existing landmark --HG-- branch : product-engine
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