summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
AgeCommit message (Collapse)Author
2011-08-31Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-08-31MergeXiaohong Bao
2011-08-31merge changes for storm-1567Oz Linden
2011-08-26STORM-1567 Mute button for llDialog popupJonathan Yap
Made changes per RB feedback.
2011-08-23mergeLogan Dethrow
2011-08-23STORM-1567 Mute button for llDialog popupJonathan Yap
Updating patch to current version of viewer-development
2011-08-16STORM-793 FIXED Disallowed parsing HTTP URLs in llGiveInventory ↵Vadim ProductEngine
notifications (one more case). The fix may look weird because we seem to wrap a SLURL with <nolink>...</nolink> tags. But actually there is no SLURL, there's just an object name. Investigating that goes beyond the bug scope.
2011-08-12mergeLogan Dethrow
2011-08-12LLProxy: xui string cleanup.Logan Dethrow
2011-08-08mergeLogan Dethrow
2011-08-08mergeVadim ProductEngine
2011-08-08STORM-632 ADDITIONAL_FIX Disallow showing URL-like avatar display names as ↵Vadim ProductEngine
Web links in the ShareItemsConfirmation notification. Updating the <nolink> tag parsing regexp to enable multiple <nolink>...</nolink> clauses in a single textbox.
2011-08-04merge changes for storm-1538Oz Linden
2011-07-29STORM-1112 Input sanitization of proxy options.Logan Dethrow
2011-07-29STORM-632 FIXED Disallow showing URL-like avatar display names as Web links ↵Vadim ProductEngine
in various places. Fixed in: * People panel -> friend list * IM toast * Friend online/offline notification toasts * IM well * Avatar inspector
2011-07-28Proxy cleanup in llstartup.cpp and llproxy.cpp.Logan Dethrow
2011-07-20Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-07-13EXP-941 FIX text and url change to the age verification dialogRichard Linden
tweaked url
2011-07-12EXP-941 FIX Text and URL change to the Age Verification dialogRichard Linden
fixed some formatting
2011-07-12EXP-941 FIX Text and URL change to the Age Verification dialogRichard Linden
2011-07-12mergeLogan Dethrow
2011-07-09mergeBrad Payne (Vir Linden)
2011-07-07Merge latest from viewer trunksimon@lindenlab.com
2011-07-06STORM-1262 FIXED Removed the original Windlight Region Settings implementation.Vadim ProductEngine
2011-07-01ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcelsimon@lindenlab.com
Privacy" changes. Many naming changes for the featureto be "See avatars" instead of "hidden avatars". Also removed the "anyone can edit terrain" checkbox and slammed the value to FALSE.
2011-07-01mergeBrad Payne (Vir Linden)
2011-06-30MergeLogan Dethrow
2011-06-30merge changes for latest viewer-developmentOz Linden
2011-06-29Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-06-29merge out latest viewer-developmentOz Linden
2011-06-29SH-1726 FIXED (Viewer modifications to advanced model upload to accommodate ↵Paul ProductEngine
upload fee & prim equivalency) - Changed XUI according to the spec - Added requesting upload permission, physics weight and fee weight - Split requesting fee and uploading model steps in mesh repository
2011-06-28STORM-1112 More cleanup of SOCKS 5 proxy code.Logan Dethrow
Renamed llsocks5.cpp to llproxy.cpp.
2011-06-22merge latest viewer-developmentOz Linden
2011-06-21MergeLogan Dethrow
2011-06-21Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com
2011-06-20Automated merge with http://hg.secondlife.com/viewer-developmentAndrew A. de Laix
2011-06-16SH-1166 FIXBrad Payne (Vir Linden)
2011-06-15SH-1166 WIPBrad Payne (Vir Linden)
2011-06-15Fix VWR-24099: disable teleport button when too many friends are selected; ↵Andrew A. de Laix
we keep the warning dialog as a failsafe.
2011-06-15Fix VWR-24099: warn user when trying to send too many teleport offers at one ↵Andrew A. de Laix
time.
2011-06-09ER-910: Parcel Privacy. Rename things in code to reflect feature name ↵Dave SIMmONs
change to "hidden avatars"
2011-06-08Merge latest from lindenlab/viewer-development/Dave SIMmONs
2011-06-08Merged STORM-1112 with viewer-development. Fixed license in socks5.cpp and ↵Logan Dethrow
socks5.h.
2011-06-06merge changes for viewer-developmentOz Linden
2011-06-01merge changes for latest viewer-developmentOz Linden
2011-06-01Merge. Pulling fix for VWR-25862 into bigger cache tree.Logan Dethrow
2011-05-24MergeDave SIMmONs
2011-05-24Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-23merge latest changes (post-2.7.0) from viewer-developmentOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-08 05:31:10 +0000