summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-03-19MergeKent Quirk
2010-03-19MergeKent Quirk
2010-03-19MergeKent Quirk
2010-03-19Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-19Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2010-03-19fixed EXT-6472 “No indication about new message/offer if IM window is open ↵Alexei Arabadji
but not in focus”, allowed to increment IM message counter when IM window is opened but doesn't have focus and reset IM counter when IM window get focus; reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/76/ --HG-- branch : product-engine
2010-03-19MergeKent Quirk
2010-03-19For EXT-4173, EXT-5871, EXT-3812: increased timeout for wearable asset ↵Brad Payne (Vir Linden)
fetches from 20 seconds to 60 seconds. Reviewed by Nyx
2010-03-19Updated normal task EXT-5905 - Resolving offers.Dmitry Zaporozhan
Reusable notifications are deleted when user closes IM floater(old - when user closes Viewer). --HG-- branch : product-engine
2010-03-19Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2010-03-19opened and fixed EXT-6478 “Loggable messages that not increments IM ↵Alexei Arabadji
counter doesn't shows in IM window”, added update of IM floater messages on logging to IM session; reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/75/ --HG-- branch : product-engine
2010-03-19Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-19EXT-6445 After copying an item, changes to new item affect old itemNyx (Neal Orman)
Since multiple inventory items can refer to the same asset ID, we needed to revert changes to old_wearable (indexed by asset ID) after saving changes made to a wearable to a new asset ID. This prevents user confusion around unsaved changes. Code reviewed by vir.
2010-03-19merge with tipMike Antipov
--HG-- branch : product-engine
2010-03-19Done normal task EXT-6267 ([TRUNCATION] [EN XUI REWORK] - Side panel, ↵Mike Antipov
profiles: the teleport button is truncated. need 'en' xui designer rework) * moved Map Button into the dropdown menu (with enable/click logic). New <menu_item_call label="Map" name="show_on_map"> is added into the menu_profile_overflow.xml * redesigned rest of buttons to accommodate available space Now buttons' widths are enough to not truncate labels in all locales. NOTE: New "Map" item menu should be localized (just move values from panel_profile.xml to menu_profile_overflow.xml) in other locales. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/59/ --HG-- branch : product-engine
2010-03-19Update for critical bug EXT-6318 [TRUNCATION] [EN XUI REWORK] - Talk button ↵Mike Antipov
is truncated "Sprechen". need xui designer to widen it by some 10 pixels * restored center aligning for Speak button's label. * also it is right aligned in 'de' locale which has too long value. * default right padding is set in 'en' locale (in has no effect on center aligned label) Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/36/ --HG-- branch : product-engine
2010-03-19(EXT-6470) [TRANSLATED BUT IN EN] Media Nav bar (Media Control)Sergei Litovchuk
- Fixed panel name in en/panel_prim_media_controls.xml. Panel name mismatch in localized files prevented from using localized attributes (e.g. tool tips) of all children of this panel. Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/73/ --HG-- branch : product-engine
2010-03-19fixed EXT-6451 Name of people sending a IM some times is NoBodyIgor Borovkov
LLSD::maps keys accross the code are used in mix of cases, lower and upper. Using "from_id" and "FROM_ID" causes avatar id to be null and thus "no body" was displayed. BUT this fix is of no use since several minutes ago viewer-offers feature was merged into release, which overrides avatar name with "Second Life" to display message about teleport offering as system message Reviewed by Q at https://codereview.productengine.com/secondlife/r/72/ --HG-- branch : product-engine
2010-03-19Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/Dmitry Zaporozhan
--HG-- branch : product-engine
2010-03-19Related to EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message needs ↵Andrew Dyukov
translation) - Slightly modified regexp to avoid adding of extra space after names and also made demands to the end of the message string more strict by escaping "." Reviewed by Kent at https://codereview.productengine.com/secondlife/r/55/ --HG-- branch : product-engine
2010-03-19Merged with viewer-offersDmitry Zaporozhan
--HG-- branch : product-engine
2010-03-19MergeKent Quirk
2010-03-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2010-03-18fix for EXT-6465: sometimes the texture fetching queue is never empty.Xiaohong Bao
2010-03-18Merge.Kent Quirk
2010-03-18Merge of PE merge with extra headKent Quirk
2010-03-18Fix for EXT-6304: Shared media cookies cannot be deleted via PreferencesMonroe Linden
Added static member functions to LLViewerMedia: clearAllCookies(), clearAllCaches(), setCookiesEnabled(), and setProxyConfig(). These iterate through all loaded instances and send appropriate messages. Also added a hack to clearAllCookies() to delete cookie files for all accounts, which should serve until we centralize cookie storage. Made LLViewerMedia set the proxy config properly when creating new instances. Callum is adding code to do something similar with the cookies enabled flag in a separate commit. Removed get_web_media from llfloaterpreference.cpp and reworked everything that used it to use the new LLViewerMedia functions instead. Reviewed by Callum at http://codereview.lindenlab.com/838003.
2010-03-18MergeKent Quirk
2010-03-18VWR-18276 en_xui_changeEli Linden
2010-03-18MergeKent Quirk
2010-03-18EXT-5923 - Change play/pause behavior of Nearby Media affordanceRichard Linden
reviewed by BenGlenn
2010-03-18MergeKent Quirk
2010-03-18Restore function lost in bad merge.Kent Quirk
2010-03-18mergeRichard Linden
2010-03-18EXT-6402 - Add support for enable/disable of Plugins (Flash) within WebKit ↵Richard Linden
to Viewer Prefs fixed radio item values so they work in true and false cases for UseExternalBrowser reviewed by Callum
2010-03-18VWR-17631 en_xui_changeEli Linden
2010-03-18EXT-5849 - [crashhunters] Crash in LLView::drawChildren()Richard Linden
attempted fix by removing gesture combo popup lists from floater view holder reviewed by Leyla
2010-03-18merge from hotfix to viewer-2-0 and resolve conflictsKent Quirk
2010-03-18FR cycle8 translation for beta5Eli Linden
2010-03-18linguisticEli Linden
2010-03-18mergeRichard Linden
2010-03-18EXT-6426 - Role titles with UTF-8 characters prevent login when enabledRichard Linden
reviewed by Monroe
2010-03-18fixing linux build errors from bao's checkin for EXT-6093Nyx (Neal Orman)
viewer wouldn't compile under linux, due to gcc being paranoid about a few things. Fixed them up and got them reviewed. Code reviewed by bao.
2010-03-18Related to EXT-5909 (Accepted/declined inventory offer shouldn't spawn chiclet).Andrew Dyukov
- Removed unnecessary string in strings.xml and substituted it in code with existing one. --HG-- branch : product-engine
2010-03-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-18MergeEli Linden
2010-03-18CT-575 DA translation for beta 5 new fileEli Linden
2010-03-18CT-575 DA translation for beta 5; JA linguisticEli Linden
2010-03-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-18EXT-5851 EXT-5422 crash on texture uploadNyx (Neal Orman)
Uploading texture caused the dummy avatar preview to initialize its joints twice removing extra call to initInstance removed the crash in LLJoint. Verified repro no longer crashes viewer. Code reviewed by Vir.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 10:25:57 +0000