summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-02-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Chuck Linden
2010-02-02Adjusted vertical position of damage text and icon.Chuck Linden
https://jira.secondlife.com/browse/EXT-4861
2010-02-02MergeEli Linden
2010-02-02merge.Tofu Linden
2010-02-02merge.Tofu Linden
2010-02-02mergeDenis Serdjuk
--HG-- branch : product-engine
2010-02-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Chuck Linden
2010-02-02Updated filter text.Chuck Linden
http://jira.secondlife.com/browse/EXT-4844
2010-02-02merge.Tofu Linden
2010-02-02trivial comment fix while I was there!Tofu Linden
2010-02-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Lynx Linden
2010-02-02DEV-32540: Lots of object IM and SLurl improvementsLynx Linden
- Don't let object names that are URLs override links to display the remote object inspector - Don't hyperlink the object name in the remote object inspector - Made the <nolink>...</nolink> regex more robust and made it support non-URLs between the tags, so that we don't get random <nolink> tags when trying to disable URLs in user-typed text. - Improved the llurlentry unit test and added some more test cases. - Hooked up another LLViewerMessage code path to objectim SLapps to pass down the owner and slurl information. - Made a few LLUrlEntryBase methods be const methods, because they are - Fixed a bug in the remote object inspector where it would never show the teleport URL.
2010-02-02merge.Tofu Linden
2010-02-02PE merge.Tofu Linden
2010-02-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Chuck Linden
2010-02-02Created new graphics for build tools "selected" states.Chuck Linden
http://jira.secondlife.com/browse/EXT-4357
2010-02-02Working on (EXT-4347) Moving object contents to inventory opens files, ↵Sergei Litovchuk
changes menu. - Removing LLPanelPlaces dependency from open_inventory_offer handler. - Added landmark offer handling to Places panel. --HG-- branch : product-engine
2010-02-02Fixed major bug EXT-4811 ([BSI] Attempt to pay an object shows wrong ↵Vadim Savchuk
Resident name in Pay Resident floater). Removed hardcoded payee name. --HG-- branch : product-engine
2010-02-02PE merge.Tofu Linden
2010-02-02reverted accidental change to floater_im_session.xmlIgor Borovkov
--HG-- branch : product-engine
2010-02-02fixed EXT-4755 Own context menu in voice chat participants list has 'Add ↵Igor Borovkov
Friend' and 'Pay' enabled --HG-- branch : product-engine
2010-02-02merged new changesgabriel lee
2010-02-02Fixed normal bug EXT-4696 - Teleport offer window is not alligned to the ↵Dmitry Zaporozhan
center of game area --HG-- branch : product-engine
2010-02-02acted on code review advise, check some return pointers for nullness etcgabriel lee
2010-02-02Supplementary fix EXT-4770 : Voice muting not working properly due to a ↵Aimee Linden
change in the Vivox API The master voice mute in preferences wasn't working either, due to the minimum scaled volume now being 30 instead of 0. Reviewed by Lynx.
2010-02-02no ticket. Removing the hack from llfloater.This code is dangerous. It ↵Denis Serdjuk
involved losing of topctrl in focusmgr and can cause strange bugs and problems. --HG-- branch : product-engine
2010-02-02mergeIgor Borovkov
--HG-- branch : product-engine
2010-02-02added saving of nearby chat history - EXT-4777 Implement saving and loading ↵Igor Borovkov
chat history for Nearby Chat (both plain text and widgeted chat) --HG-- branch : product-engine
2010-02-02mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-02fix for normal EXT-4810 Block hot-keys in mouse-look modeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-02Fxed normal bug EXT - 4106 (Tabbed IM floater isn't highlighting labels when ↵Paul Guslisty
new IMs are received) --HG-- branch : product-engine
2010-02-02Fixed normal bug EXT-4740 - Object inspector hides however context menu presentDmitry Zaporozhan
--HG-- branch : product-engine
2010-02-02added loading/parsing of Nearby Chat history - EXT-4777 Implement saving and ↵Igor Borovkov
loading chat history for Nearby Chat (both plain text and widgeted chat) --HG-- branch : product-engine
2010-02-02Fixed major bug (EXT-2316) Insert the option "pay" in the profile.Sergei Litovchuk
- Restored fix made in viewer-2-0/product-engine changeset 4880:ff1363072741. --HG-- branch : product-engine
2010-02-02mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-02fix for low EXT-4780 Nearby chat windows doesn't pop up when clicking on ↵Ychebotarev ProductEngine
object chat toast --HG-- branch : product-engine
2010-02-02merged back my last changesgabriel lee
2010-02-02Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-02-02mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-02sidefix for EXT-4808 Unfocused Snapshot floater covers aother floatersYchebotarev ProductEngine
fix preview position --HG-- branch : product-engine
2010-02-01Test commit.Eli Linden
2010-02-01Fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client)Monroe Linden
Removed some unnecessary string copies in LLTextBase and LLNormalTextSegment by changing getWText() to return const LLWString& (instead of LLWString), and storing the result in a const LLWString& instead of an LLWString in places where the string doesn't need to be modified. Made LLTextViewModel::getDisplay() also return const LLWString& instead of LLWString. Removed a couple of unused local string variables in LLTextBase (the compiler flagged these after converting the local copies to const LLWString&).
2010-02-01Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallumRick Pasetto
2010-02-01dos2unix these filesRick Pasetto
2010-02-01Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-02-01Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2010-02-01Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Chuck Linden
2010-02-01EXT-4613: No longer get to throttle for quite folders (COF, trash, outfits, etc)Eric M. Tulla (BigPapi)
-Reviewed by nyx
2010-02-01Disabled magnifying glass icon from filter editors.Chuck Linden
https://jira.secondlife.com/browse/EXT-4839
2010-02-01Automated merge with ssh://lis@hg.lindenlab.com/viewer/viewer-2-0Lis Linden