summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-31SNOW-683 VWR-8726 : Turn off swirling lights for scripted objectsMerov Linden
2010-08-26Manual merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-24EXT-8672 FIXED ([HARD CODED] ALL LANGS The word \"Saved\" is hard coded, in ↵Paul Guslisty
the long timestamp displayed in IM when user is offline) - Created a string with a time stamp parameter and added it to the strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/872/ --HG-- branch : product-engine
2010-08-19fixed line endingsLeyla Farazha
2010-08-19synchronous llavatarcachename::get calls now return true even if entry is ↵Leyla Farazha
expired
2010-08-16VWR-20673 (SNOW-743) FIXED Compiler warning: 'region_access' may be used ↵Aimee Linden
uninitialized in this function
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-06fix for local chatLeyla Farazha
2010-08-04Merge with dessie/viewer-releaseLeyla Farazha
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-07-30Merge with dessie/viewer-releaseLeyla Farazha
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27Merge from dessie/viewer-releaseLeyla Farazha
2010-07-22EXT-8392 FIXED Localized folder name in the landmark creation notification.Vadim Savchuk
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/789/ --HG-- branch : product-engine
2010-07-30mergeRichard Nelson
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-07-26(hairy) merge from viewer-releaseTofu Linden
2010-07-21DEV-50472 Transaction notifications wrap and amounts cannot be seen in ↵Leyla Farazha
notifications list
2010-07-20DEV-50726 Userame shown in notification to giver of an in inventory itemLeyla Farazha
2010-07-20mergeRichard Nelson
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-16EXT-8358 FIXED Added one more server hardcoded string to global strings in ↵Mike Antipov
notifications.xml to make it localizable. Added "You died and have been teleported to your home location" string. It requires localization efforts. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/776/ --HG-- branch : product-engine
2010-07-15DEV-50739 Message recieved by Send Message to Region function is from ↵Leyla Farazha
Username only reviewed by Richard cc#221
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-15EXT-8303 FIXED [crashhunters] Crash in inventory_offer_mute_callbackAlexei Arabadji
Details: Instead of copying shared pointer, raw pointer was used, that cause crash, since notification responder object was accessed after it was destroyed. Replaced usage copying of raw pointer instead of copying shared pointer of notification responder object, that should live after notification destroyed. --HG-- branch : product-engine
2010-07-14Merged from viewer-releaseDessie Linden
2010-07-13EXT-8341 FIXED Avoided assertion on receiving object auto return notification.Alexei Arabadji
Details: 1 Provided passing necessary is_group parameter to LLPostponedNotification::add<LLPostponedServerObjectNotification> method call; 3 Corrected handling group name in LLPostponedNotification::onCachedNameReceived; 2 Added check on retrieved name from cache name and replacement with fallback value. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/743/ --HG-- branch : product-engine
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-06-25Merged from viewer-releaseDessie Linden
2010-06-24EXT-7967 FIXED Hyperlink in clothing offer dialog does nothingLoren Shih
Fixed incorrect logic for auto_open and added some comments to explain expected behavior.
2010-06-21Merge from ssh://hg.lindenlab.com/dessie/viewer-releaseLeyla Farazha
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-18EXT-6710 FIXED Corrected 'ItemsShared' notification message and provided ↵Alexei Arabadji
logging of 'item shared' message instead of spawning IM session and add message to it. Details: 1 Corrected 'ItemsShared' notification message. 2 Avoided spawning session on item shared event. 3 Provided logging of item shared message. 4 Provided logging of 'IMSystemMessageTip' notification without opened related IM session. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/612/ --HG-- branch : product-engine
2010-06-17Merge (and resolve conflict) from q/viewer-releaseKent Quirk
2010-06-16EXT-7735 FIXED When receiving a folder, "Show" (or hotlink) doesn't do anythingLoren Shih
Fixed highlight and open item code to work for both categories and items (was previously only working for items).
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-10Merging latest dessie/viewer-release into brad/viewer-publicLynx Linden
2010-06-08EXT-6655 Fixed Made the default busy message repsonse localizable with ↵Andrew Dyukov
already existing account settings - The root of busy response problem is that this text is located in non-localizable xml and, to make things worse, may be changed by user. So usual translation approach is little help here. So busy response was set the following way(EXT-5885)- on first run, string was written there from strings xml and was never changed later without direct user actions. So after changin locale message always remained the same. - To make this string localize each time locale is changed and if it is the same as default message, new setting was added- BusyResponseChanged which is TRUE if user's busy message differ's from default. If it is true, we do nothing when locale changes, otherwise we set default message from current locale as user's busy message. - Old transitional code from DEV-24146 was removed in this diff including unnecessary "BusyModeResponse2" setting(it is not needed because we'll anyway have to set busy message to default after first run of viewer after this fix and now busy response will be stored in "BusyModeResponse"). Warning! If user modified busy response message before this fix, it will be reset to default after first postfix run. Reviewed by Richard Linden at https://codereview.productengine.com/secondlife/r/350/ --HG-- branch : product-engine
2010-06-02MergeLeyla Farazha
2010-06-02removed "SESSION_NAME" in favor of doing a gCacheName lookupLeyla Farazha
reviewed by James
2010-06-02DEV-50467 You paid (nobody) message when creating group and classifiedJames Cook
Also fixes DEV-50470, Attempting to create a group with insufficient funds generates nobody paid you L$-1 notice. Needed to be more clever about which strings to show when partial information is available about the transaction. Reviewed with Leyla.
2010-06-02notification fixesleyla
2010-06-01Clean up some commentsJames Cook
2010-05-28MergeLeyla Farazha
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 01:31:58 +0000