summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-02-03Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-02-03No ticket. Added comments regarding EXT-4758 and ↵Andrew Dyukov
LLVoiceClient::voiceWorking() in general to clear things up a bit. --HG-- branch : product-engine
2010-02-03fixed EXT-4776 Make avatars in nearby chat inspectableIgor Borovkov
--HG-- branch : product-engine
2010-02-03fixed EXT-4764 “Forbid connecting to different voice channels at once”,Alexei Arabadji
removed redundant call status notifications: ringing, connected, hang_up, unavailable, answering; --HG-- branch : product-engine
2010-02-03Update for normal bug EXT-4873 - Homepage field in My Profile (edit) no ↵Dmitry Zaporozhan
longer appears --HG-- branch : product-engine
2010-02-03Fixed normal bug EXT-4873 - Homepage field in My Profile (edit) no longer ↵Dmitry Zaporozhan
appears --HG-- branch : product-engine
2010-02-03Updated comment for ticket EXT-4772(No new IM notification when in tabbed IM ↵Dmitry Zaporozhan
mode) --HG-- branch : product-engine
2010-02-03Fixed normal bug EXT-4766 - System notifications in nearby chat has default ↵Dmitry Zaporozhan
avatar icon and behave like sent from object --HG-- branch : product-engine
2010-02-03Fixed low bug EXT-4802 - Clearing whole teleport history doesn't clear TP ↵Dmitry Zaporozhan
history from nav bar --HG-- branch : product-engine
2010-02-03Merge with reverted changesetMike Antipov
--HG-- branch : product-engine
2010-02-03Backed out changeset 5add97e5b6cfMike Antipov
Related to major bug EXT-3985 [BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x Removed auto-cleanup patch to repair Lanmarks in Favorite bar (remove LM Sort prefixes) --HG-- branch : product-engine
2010-02-03No ticket: removed deprecated commented out codeMike Antipov
--HG-- branch : product-engine
2010-02-03Fixed critical bug EXT-4838 ([NUX] Add empty Groups list condition text)Mike Antipov
- moved processing of empty list message into LLGroupList - implemented separate messages for empty list: No matched groups / no groups at all --HG-- branch : product-engine
2010-02-03fixed EXT-4805 “Friend offer is corrupted in resized IM window”,Alexei Arabadji
reverted IM floater default width; made offer buttons have absolute positions; avoided text message scrolling with default IM floater width; --HG-- branch : product-engine
2010-02-03mergeangela
2010-02-03EXT-4603) Right-clicking a sound and choosing Play doesn't actually play itangela
2010-02-03resolve merge in llsidepanelinventory.cppangela
2010-02-03Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2010-02-03EXT-1640 Application Icon Misaligned on OSX Installer Dialog (renamed to ↵angela
secondlife beta)
2010-02-02MergeMark Palange (Mani)
2010-02-02EXT-4598 - Added UI handling for E_ST_BAD_ROOT result of animation loading.Mark Palange (Mani)
Reviewed by Palmer
2010-02-02Further fixes for EXT-4689 (Long-word chat spam cripples fps and/or ↵Monroe Linden
disconnects client). This should fix the inefficiencies in the append path that made viewer FPS drop severely when addinglarge amounts of text to the nearby chat floater. Resizing the floater with a huge amount of text in it is still pretty bad, but fixing that will require some bigger architectural changes. Changed LLTextBase::needsReflow() to take an offset at which to start reflow processing. Changed most needsReflow() calls in LLTextBase to supply a proper index. Changed LLTextBase::reflow() to use the reflow index maintained by needsReflow(). Removed all needsReflow() calls from LLTextEditor (the only way for it to manipulate the text is through functions in LLTextBase that already manage reflowing internally). Removed LLTextEditor::replaceUrlLabel(), since it was identical to the inherited version LLTextBase::replaceUrlLabel(). Reviewed by Richard.
2010-02-02automated merge viewer2.0->viewer2.0Loren Shih
2010-02-02EXT-4874 : Client freezes on right click - take itemLoren Shih
Fixed infinite loop due to parent_id not being incremented properly in loop.
2010-02-02Remove a couple of header deps on llprimitive.h for faster buildy goodness.Tofu Linden
2010-02-02automated merge viewer2.0->viewer2.0Loren Shih
2010-02-02EXT-4243 : Sorting is broken in inventoryLoren Shih
Landmarks were being special cased for sorting; removed this so that they sort by the same rules of other folders.
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-02Adjusted vertical position of damage text and icon.Chuck Linden
https://jira.secondlife.com/browse/EXT-4861
2010-02-02Fixed normal bug EXT-4127 ([BSI] Cannot copy/paste from another resident's ↵Eugene Mutavchi
picks / classifieds) --HG-- branch : product-engine
2010-02-02Fixed normal bug EXT-4115 (Cannot copy/paste from another resident's profile)Eugene Mutavchi
--HG-- branch : product-engine
2010-02-02Fixed normal bug EXT-4105 ([BSI] group names are not able to be copied from ↵Eugene Mutavchi
side panel) - changed LLTextBoxEx class to inherit the LLTextEditor behavior --HG-- branch : product-engine
2010-02-02fixed low Bug EXT-4242 History Dropdown should appear immediately ↵Denis Serdjuk
when click-dragging downward from back button LLPullButton has been implemented to handle such behavior --HG-- branch : product-engine
2010-02-02MergeEli Linden
2010-02-02fixed bug EXT-4241 Back button in nav bar should remain depressed during ↵Denis Serdjuk
click-hold Cause: mouse capture was reset by the popup menu. It broke mouse event workflow and made invalid changing of pressed state. Solution: Workaround with mouseUp callback of gMenuHolder has been implemented to handle mouseUp event and to change pressed state of the buttons. --HG-- branch : product-engine
2010-02-02Fixed normal bug EXT-4758 ("Call" button in IM window is disabled after call ↵Andrew Dyukov
from parcel with disabled voice) - One more voice client state is now treated by voiceWorking() as valid. --HG-- branch : product-engine
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