summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2013-03-28Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internalLogan Dethrow
2013-03-28Made a bug that was masking the warning about mismatched caps coming from a ↵Logan Dethrow
region. They could never match because certain capabilities are explicitly not stored when we receive them. * Made mSecondCapabilitiesTracker set capabilities in a way that more closely matches mCapabilities so that they will match up when we get a second cap grant from a region if the caps that were sent are actually the same. * Added more logging around setting a region's seed capability. * Also added a static function in llviewerregion to dump out a CapabilityMap based on the logActiveCapabilities method. Defined the old method in terms of the new static free function.
2013-03-20Merge with viewer-chuiprep@lindenlab.com
2013-03-13CHUI-796 FIXED User doesn't get all messages in 'do not disturb' modemaksymsproductengine
2013-03-11Viewer-chui mergeprep
2013-02-12CHUI-758: Group notice received in DND mode causes crash on startup when ↵Gilbert Gonzales
auto-exiting DND mode. Crash occurred because two instances of the Group Notice notification were trying to be added from the persistent storage and then the DND storage.
2013-02-01CHUI-691: Now when an estate message is received while in DND mode, a toast ↵Gilbert Gonzales
notification will appear.
2013-02-01CHUI-689: When DND mode is enabled, making a direct delivery purchase ↵Gilbert Gonzales
results in an IM message from '(Nobody)'. Solution: Fixed a problem in process_improved_im that would falsy use system messages while in DND mode as an IM from a user. Also made it so that while in DND mode, SystemMessages and message with a high or greater priority are shown to the user as toasts (before a notification chiclet would just appear without the toast).
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-24CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tabmaksymsproductengine
2013-01-25CHUI-697 FIXED We don't need to update form for Inventory offer notificationmaxim@mnikolenko
2013-01-18merging latest changesCho
2013-01-18CHUI-688 FIX Viewer crash when blocked user sends friend requestCho
Added a check for notification_ptr being null in friendship_offer_callback
2013-01-17CHUI-604: Problem: DND response was inside of the responder for the ↵Gilbert Gonzales
inventory offer. Resolution: DND response is now sent upon receiving an offer notification from an agent.
2013-01-04Merge with viewer-chuiMerov Linden
2013-01-04Merge with viewer-chuiMerov Linden
2013-01-03CHUI-499: Fixed a serialization problem where the a notification's ↵Gilbert Gonzales
objectInfo was not being serialized/deserialized.
2012-12-17CHUI-580 : WIP : Protect callback connections passed to ↵Merov Linden
LLAvatarNameCache::get() where necessary
2012-12-18CHUI-569: Ensure that we create a friend request notification even in the ↵William Todd Stinson
case of do-not-disturb mode. The DND mode will log it to a file to be re-created when DND mode is exited.
2012-12-05Pull merge from dev repoMerov Linden
2012-12-05CHUI-580 : WIP : Change the display name cache system, deprecating the old ↵Merov Linden
protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-05CHUI-519 FIXED Do not put offered items into the trash while in Busy / DND modemaksymsproductengine
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-23CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of ↵AlexanderP ProductEngine
different types of notifications): include flashing for the nearby chat
2012-11-15CHUI-518: WIP First pass as implementing auto-reject voice calls in do not ↵William Todd Stinson
disturb mode.
2012-11-09CHUI-517: Updating the do not disturb message automatically sent to other ↵William Todd Stinson
users when they attempt to contact a person in do not disturb mode.
2012-11-09CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and ↵AlexanderP ProductEngine
in accordance with the naming convention in the project, some classes and corresponding files should be renamed: LLIMConversation -> LLFloaterIMSessionTab LLIMFloater -> LLFloaterIMSession LLNearbyChat -> LLFloaterIMNearbyChat LLIMFloaterContainer -> LLFloaterIMContainer LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-08CHUI-516: Correcting crash when receiving a god-like teleport lure request ↵William Todd Stinson
while in do-not-disturb mode.
2012-11-08CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now ↵William Todd Stinson
refers to it as Do Not Disturb mode.
2012-11-07CHUI-484: Ensuring that the busy/do-no-disturb message is sent when the user ↵William Todd Stinson
is in the busy/do-not-disturb mode.
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-10Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.William Todd Stinson
2012-10-03Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix ↵Dave Parks
out-of-order deletion of LLTextureFetch on shutdown
2012-09-20reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-08-31CHUI-315 (Nearby chat messages do not appear in conversation floater): ↵AlexanderP ProductEngine
cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it.
2012-08-24Automated merge with http://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-08-22CHUI_310 make NearbyChat a singletoneAlexanderP ProductEngine
2012-08-17Expanding region flags to 64 bits. Adding region protocol flagsDon Kjer
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-06removed some duplicate fast timer declarationsRichard Linden
2012-07-27Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.Todd Stinson
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-27CHUI-151 FIXED (Implement conversation log)Paul ProductEngine
A brief explanation of what have been implemented. More information can be found in comments. 1. Created conversation history viewer (llfloaterconversationpreview) 2. Created LLConversation and LLConversationLog classes which represent and hold data of conversations (llconversationlog) 3. Created LLConversationLogList and LLConversationLogListItem which are the visual representation of LLConversationLog and LLConversation respectively 4. Created LLFloaterConversationLog - which holds and displays LLConversationLogList
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com