| Age | Commit message (Collapse) | Author | 
|---|
|  | preferences | 
|  |  | 
|  | and llunittype.h for now | 
|  |  | 
|  | # 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 | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | at your friends list | 
|  | algorythmic improvement for MAINT-6891 | 
|  | history | 
|  |  | 
|  |  | 
|  | Minor change in showHistory() | 
|  |  | 
|  |  | 
|  | 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 | 
|  | cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it. | 
|  |  | 
|  | Fixed warnings when creating a nearby chat toast. | 
|  |  | 
|  | dismiss toast
removed special case logic for dealing with user online/offline collisions
added ability to cancel old duplicate notifications | 
|  | EXP-1316 Minimized Snapshot floater has a snapshot preview image attached below.
EXP-1318 Clicking on nearby chat toasts should bring up Nearby Chat history | 
|  | one in nearby chat toasts. | 
|  | names in Nearby Chat toasts. | 
|  | the font color selected in Preferences->Chat.
Removed unused "ChatToastAgentNameColor" setting from colors.xml. | 
|  | clicking on user name in a nearby chat toast.
Now clicking an avatar name opens avatar profile; clicking an object name opens object inspector.
This change rolls back the fix of STORM-358. | 
|  | toasts. | 
|  |  | 
|  | streamlined LLUICtrlFactory's interface | 
|  | removed redundant functionality
moved buildPanel to LLPanel | 
|  |  | 
|  | message
Reviwed by Igor Borovkov at https://codereview.productengine.com/secondlife/r/371/
--HG--
branch : product-engine | 
|  |  | 
|  | history instead of avatar profile.
https://codereview.productengine.com/secondlife/r/287/
reviwed Vadim Savchuk
--HG--
branch : product-engine | 
|  | avatar icon and behave like sent from object
Updated nearby toast to display system icon for system message.
Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/208/
--HG--
branch : product-engine | 
|  | name changes
--HG--
branch : product-engine | 
|  | from objects, instead of using generic image for missing profile picture
--HG--
branch : product-engine | 
|  | object chat toast
--HG--
branch : product-engine | 
|  | --HG--
branch : product-engine | 
|  | full avatar name in communication | 
|  | not URL in browser.
also move real action from mouse_down to mouse_up (since clicking on url is processing in mouse_up).
--HG--
branch : product-engine | 
|  | nearby chat toasts and log
for information - since I think that messages from nowhere is bad practice for user - if object that send message has no name I use object id as name
--HG--
branch : product-engine | 
|  | --HG--
branch : product-engine | 
|  | --HG--
branch : product-engine | 
|  | --HG--
branch : product-engine |