| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp
 | 
 | 
 | 
 | 
 | 
 | 
LF, and trim trailing whitespaces as needed
 | 
 | 
 | 
 | 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 | 
 | 
It feels wrong to return a dumb LLInstanceTracker subclass* from getInstance()
when we use std::shared_ptr and std::weak_ptr internally. But tweak consumers
to use 'auto' or LLInstanceTracker::ptr_t in case we later revisit this
decision.
We did add a couple get() calls where it's important to obtain a dumb pointer.
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
region's maturity exceeds the current maturity settings
 | 
 | 
 | 
 | 
 | 
 | 
conversation with user is the active.
 | 
 | 
will be played correctly now.
 | 
 | 
Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
 | 
 | 
 | 
 | 
 | 
 | 
last commit for CHUI-489.
 | 
 | 
(for inventory/teleport offer) would be played for the toast popup as well as once the conversations floater was opened. And also when a button was clicked in the conversation floater to 'accept' or 'deny' the offer. Now only playing the sound notification when the initial offer has been made.
 | 
 | 
dismiss toast
removed special case logic for dealing with user online/offline collisions
added ability to cancel old duplicate notifications
 | 
 | 
 | 
 | 
 | 
 | 
Notification handlers now use LLHandles to screen channels.
 | 
 | 
phase 2, removal of extraneous signaling in favor of llnotificationchannels
made notificationchannels work better with overrides and lifetime managed
by creator
 | 
 | 
phase 1, removal of most of llnotificationhandler
 | 
 | 
logged in
reviewed by Monroe
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
respective IM window is open and in focus.
Minor changes to supress toast for FriendshipAccepted notification.
--HG--
branch : product-engine
 | 
 | 
Reusable notifications are deleted when user closes IM floater(old - when user closes Viewer).
--HG--
branch : product-engine
 | 
 | 
revised embedding and logging offer notification to provide loading log entry
in case notification doesn't exist;
--HG--
branch : product-engine
 | 
 | 
fixed IM message counter when received interactive notification(offer);
corrected logging to file of offer notification;
enabled logging for FRIENDSHIP_ACCEPTED notification;
--HG--
branch : product-engine
 | 
 | 
made not spawn IM chiclet friendship accepted notification;
added friendship accepted notification to syswell chiclet;
--HG--
branch : product-engine
 | 
 | 
made all type offers be embedded to the IM floater;
made showing offer toast if IM floater isn't visible;
corrected IM message counter on showing offer toast;
--HG--
branch : product-engine
 | 
 | 
Notifications wells”,
embedded inventory offer panel into IM window;
--HG--
branch : product-engine
 | 
 | 
--HG--
branch : product-engine
 | 
 | 
--HG--
branch : product-engine
 | 
 | 
-- made dialog a modal alert
-- logging to IM is left as it was
--HG--
branch : product-engine
 | 
 | 
made inventory and teleport offers spawn chiclet;
made 'inventory accepted' toast as notytip;
--HG--
branch : product-engine
 | 
 | 
history”
--HG--
branch : product-engine
 | 
 | 
--HG--
branch : product-engine
 | 
 | 
by Chiclet subsystem along with Notificaton subsystem)
--HG--
branch : product-engine
 | 
 | 
avoided IM-toast popup when adding message to session;
--HG--
branch : product-engine
 | 
 | 
notify toast and adding record to IM history";
fixed avatar icon in IM-floater when message added to IM-session;
avoided popup of IM-tast when message added to IM-session;
--HG--
branch : product-engine
 | 
 | 
Fixed many more includes
 | 
 | 
--HG--
branch : product-engine
 |