Kokua-3.5.0 Change Log

2013-04-04 Nicky Perian  

* .hgtags: Added tag Kokua-3.5.0 for changeset 7166ba3769d3 [83e64b85795e] [tip]

2013-03-28 Nicky Perian  

* indra/llcommon/llversionviewer.h, indra/newview/viewerinfo.cpp: Version settings Kokua-3.5.0 [7166ba3769d3] [Kokua-3.5.0]

2013-04-04 Nicky Perian  

* .hgtags, indra/llui/lltextbase.h,	indra/newview/llfloaterpreference.cpp, indra/newview/skins/default/xui/en/notifications.xml: Merge LL viewer-release [579ca35c5120]

2013-04-03 Oz Linden  

* .hgtags: Added tag 3.5.0-release for changeset adc360e6bf21 [0f2779556afb]

2013-04-01 Oz Linden  

* .hgtags: Added tag 3.5.0-beta7 for changeset 5c6098fd17d4 [adc360e6bf21] [3.5.0-release]

2013-03-29 Oz Linden  

* .hgtags: merge changes for DRTVWR-306 [5c6098fd17d4] [3.5.0-beta7]

* .hgtags: tag merge of DRTVWR-306 [29bf13ae6932]

2013-03-29 Mnikolenko ProductEngine  

* indra/newview/llimview.cpp: Additional fix for CHUI-903 [902caf2b9fdb] [DRTVWR-306]

2013-03-28 AlexanderP ProductEngine  

* indra/newview/llfloaterpreference.cpp, indra/newview/skins/default/xui/en/notifications.xml: CHUI-799 FIXED Notification is not given to user when they select only friends and groups can IM me preference [3cdd41083d7c]

2013-03-29 Mnikolenko ProductEngine  

* indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llimview.cpp: CHUI-903 FIXED Don't show toasts if Session floater is torn-off and in focus. [d4985146d167]

2013-03-28 AlexanderP ProductEngine  

* indra/newview/llconversationview.cpp, indra/newview/llimview.cpp: CHUI-896 FIXED Line flashing and FUI button flashing not working correctly for CHUI notifications: added flashing of the line item after conv. floater opens [0b57a47dca91]

2013-03-28 Gilbert Gonzales  

* indra/llui/lltexteditor.cpp: CHUI-905 (Viewer crashes while using Insert keyboard key in chat): Problem was because when insert was used at the end of a string of	text, this would attempt to delete something past the bounds of the string...as a side effect the size of the segment was increasing even though the string length never changed. The segment size would be greater than the string size and would eventually cause an invalid read outside the bounds of the string. [41e4a139553a]

2013-03-28 maksymsproductengine  

* indra/llui/llchatentry.cpp, indra/llui/llchatentry.h,	indra/llui/llscrollbar.cpp, indra/llui/llscrollbar.h,	indra/llui/llscrollcontainer.cpp, indra/llui/llscrollcontainer.h,	indra/llui/lltextbase.cpp, indra/llui/lltextbase.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-855 FIXED Text entry bar auto expand does not resize [460b2d69e68f]

2013-03-30 Nicky Perian  

* autobuild.xml, indra/newview/viewer_manifest.py: [linux64]Update vivox voice 32 bit libraries to openal 1.15.1 [fa72c386acc3]

* indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llnotificationofferhandler.cpp: Post back out of CHUI-667 make it build [0e30840e40d7]

2013-03-21 Nicky Perian  

* indra/llui/llui.cpp, indra/llui/llui.h,	indra/newview/CMakeLists.txt, indra/newview/llappviewer.cpp, indra/newview/lldeferredsounds.cpp, indra/newview/lldeferredsounds.h,	indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llnotificationofferhandler.cpp, indra/newview/llprogressview.cpp, indra/newview/llvieweraudio.cpp: Backed out changeset: 6fad868f2f13 CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played. [652e065ff830]

* indra/llaudio/llaudioengine.cpp, indra/llaudio/llaudioengine.h,	indra/newview/llappviewer.cpp, indra/newview/lldeferredsounds.cpp, indra/newview/lldeferredsounds.h:	Backed out changeset: 0da137e1afee CHUI-667: Post code review changes [1388c4629be4]

* indra/newview/llappviewer.cpp: Backed out changeset: 11fdcfa598b2 CHUI-667: attempting to correct Mac/Linux build issue. [8e3f755cd31f]

2013-03-30 Nicky Perian  

* [linux64] Recast pointer from BOOL to ptrdiff_t //reinterpert_cast did not change precision error. [2353650460ed]

* indra/newview/llfloaterimnearbychat.cpp: [mq]: 2013-03-30_10-11-54_r28264+.diff [110e9cf0afb9]

* autobuild.xml, indra/newview/viewer_manifest.py: [linux64] Update openal tp version to 1.15.1 [2bb02e55f27c]

* autobuild.xml: [linux]Update openal to version 1.15.1 [ca943b8f2877]

* autobuild.xml: [windows] Update openal to version 1.15.1 [5e18562da7f0]

2013-03-28 Nicky Perian  

* indra/newview/skins/default/textures/textures.xml: Merge Catch up with dropped files. [02a40e0fc7a6]

* .hgtags, indra/llui/llscrolllistctrl.cpp, indra/llui/llscrolllistctrl.h,	indra/newview/app_settings/settings_per_account.xml, indra/newview/llvoavatar.cpp, indra/newview/llvoicevivox.cpp: Merge viewer-beta [e2e080f9e88e]

2013-03-28 Oz Linden  <oz@lindenlab.com>

* .hgtags: Added tag 3.5.0-beta6 for changeset 55339537d99a [61e374bd07fd]

* .hgtags: merge changes for DRTVWR-305 [55339537d99a] [3.5.0-beta6]

* .hgtags: tag merge of DRTVWR-305 [f06b94f18fcc]

2013-03-27 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llimview.cpp: CHUI-486 ADD FIX Update Preferences -> Chat XUI 1) when preference	is "Pop up" - added toast according to Kurt's comment from	22/Dec/12; 2) fixed line item flashing and "Chat" button flashing in other cases according to original matrix. [fd6b510e83f5] [DRTVWR-305]

2013-03-27 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [092d5b9030b0]

* indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llnotificationstorage.cpp, indra/newview/llpersistentnotificationstorage.cpp: CHUI-875 (Viewer experiences a 10s delay on dnd (do not disturb)	notification loading): For now adding logging when reading from persistent notifications and from dnd notifications. [b6930387d521]

* indra/newview/llfloaterimnearbychat.cpp: merge [c976e48e5c3b]

* indra/newview/llfloaterimnearbychat.cpp: CHUI-851 ([CHUIBUG]Focussing issue and unresponsive tabs when focus	is brought back to the HUB): Now when pressing enter a docked nearby chat floater will be focused and the conversation line item will be selected. When the nearby chat is not docked then only the floater will be focused. [7c52d666a573]

2013-03-27 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [e7cce423f5e8]

* indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsessiontab.cpp: CHUI-901 : Fixed! Do touch torn off state in restoreFloater [bd6df095a243]

2013-03-27 mberezhnoy  <mberezhnoy@productengine.com>

* merge [f044701bda47]

* indra/newview/llfloaterimnearbychat.cpp: CHUI-893 ([CHUIBUG]Chat input field scrambles "/nod") [60d1ed0d04b2]

2013-03-27 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llchiclet.cpp: CHUI-894 FIXED Call closeAll for LLIMWellWindow to clear object notifications. [4da35bb6a6b7]

2013-03-27 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [ce4f106e4424]

2013-03-26 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/lltextbase.cpp: CHUI-846 ([crashhunters] crash in LLFontGL::maxDrawableChars): Added logging for bug to further track down problem when it occurs. Need to debug further based off information. [53b94325ce54]

2013-03-27 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-895 FIXED Show toasts for messages if conversation is collapsed to Input bar(regardless of other prefs). [6fa503f80da5]

2013-03-26 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/app_settings/settings_per_account.xml, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h: CHUI-862 FIXED Save collapsed state for nearby chat. [0710dc28b36d]

2013-03-25 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [9bfeb6a259e6]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp: CHUI-892 : Fixed. restoreFloater called when floater docked [35926ccef8e2]

2013-03-22 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-486 FIXED Update Preferences -> Chat XUI: implemented new bthavior; deleted spaghetti code [550323da63b0]

2013-03-25 mberezhnoy  <mberezhnoy@productengine.com>

* merge [9ea8ca57f61a]

* indra/llui/llscrolllistctrl.cpp, indra/llui/llscrolllistctrl.h:	CHUI-885 (View Profile,Send IM and Add friend are not functional in	context menu for allowed or banned users of the parcel.) [f72f89a14ccc]

2013-03-23 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h: CHUI-888 : Fixed! Overload setVisibleAndFrontmost so that we set the focus if requested (was dropped in the shuffle before). [35204154286b]

2013-03-22 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-889 : Fixed! Collapse/Expand of participants list in torn off panels [88d1c7655d1d]

* indra/newview/llvoicevivox.cpp, indra/newview/llvoicevivox.h: CHUI-877 : Fixed! Ignore the Vivox buffy names right now and avoid invalidation avatar name cache when seeing a difference with vivox [69f9e68baeb2]

* Pull from lindenlab/viewer-chui [b910a4f97e3b]

2013-03-21 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [be6040b3d1f8]

* indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h: CHUI-871, CHUI-738 : Fixed! Name tags existence was using a bogus test. Using a boolean for existence and straight logic, no	intermediate string [129adc7b616f]

2013-03-22 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-854 FIXED Don't expand chat in collapsed mode. [d65a8c79236d]

* indra/newview/llfloaterimnearbychat.cpp: CHUI-879 FIXED Expand and then collapse message pane when floater opens to avoid UI issues. [6b9389c9554b]

2013-03-21 Nicky Perian  <nickyperian@yahoo.com>

* .hgtags, indra/llui/lltoolbar.cpp: Merge viewer-beta [5cae5fe1ddf6]

2013-03-21 Oz Linden  <oz@lindenlab.com>

* .hgtags: Added tag 3.5.0-beta5 for changeset dd058a6093c4 [e7cabbf8470c]

* .hgtags: merge changes for DRTVWR-304 [dd058a6093c4] [3.5.0-beta5]

* .hgtags: tag merge of DRTVWR-304 [70ce9a0d514e]

2013-03-21 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [4d5f6234dc59] [DRTVWR-304]

* indra/llui/lltoolbar.cpp: CHUI-881 ([CHUIBUG]Viewer crashes when user drag and drop the	participant from the people floater to the one of the tool bars): Problem was that the item dragged from the people list was not of type inventoryitem. Instead of casting to an inventoryitem and checking if the item being dragged is a widgit, instead look at the cargo type (which also specifies that the dragged item is a widgit	but doesn't need to typecast). [dadc79bffc86]

2013-03-21 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-878 FIXED Torn off conversation window width can be reduced and lose vertical scroll bar: manually setting of the floater's minimal size [79a314217339]

2013-03-21 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h:	CHUI-855 FIXED Text entry bar auto expand does not resize [6683e8e3905a]

2013-03-21 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-880 FIXED Show Button panel if floater is torned off. Don't	show Conversation floater in Mouselook, if Nearby chat is torned off. [99bf15b0e489]

2013-03-21 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-858 FIXED Text can be clipped by text input bar in message panel [3d9fe0176455]

2013-03-21 Nicky Perian  <nickyperian@yahoo.com>

* .hgtags, indra/llrender/llgl.cpp, indra/newview/app_settings/settings.xml, indra/newview/app_settings/settings_per_account.xml, indra/newview/llfloaterpreference.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/skins/default/textures/textures.xml: Merge viewer-beta [a4588185da88]

2013-03-20 Oz Linden  <oz@lindenlab.com>

* .hgtags: Added tag 3.5.0-beta4 for changeset 53cffdde0b3c [7b7566bcf6da]

* .hgtags: merge changes for DRTVWR-303 [53cffdde0b3c] [3.5.0-beta4]

* .hgtags: tag merge of DRTVWR-303 [ba66cb66206c]

2013-03-20 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llfloaterimnearbychat.cpp: CHUI-873 FIXED [CHUIBUG]Torn off nearby chat with message panel hidden has huge bottom padding when opening in mouselook mode [910b5fad950e] [DRTVWR-303]

2013-03-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/app_settings/settings_per_account.xml: CHUI-857 Nearby chat opens as torn off on first login: changed initial setting for nearby chat docked state [b3c8be71cd35]

2013-03-20 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h: CHUI-870 FIXED Expand Message panel after clicking toast. [1dbdb6d77b7e]

* indra/newview/llfloaterimsessiontab.cpp: CHUI-860 FIXED Don't call onSlide to change Participant list's	state [a71d31f195f0]

* indra/newview/llfloaterimnearbychat.cpp: CHUI-869 FIXED Clicking on toast will restore Message pane. [be5c53347adc]

2013-03-20 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_session.xml: merge [603d443d8976]

2013-03-19 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-812 ([CHUIBUG]Resizing "Nearby chat" window creates confusing	layout) [686b786f7a5e]

2013-03-19 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-843 ([CHUIBUG]Suggested alteration to toolbar_panel in	floater_im_container in CHUI): Adjusted button layout in conversation floater. [7bf7bb04b6e5]

* indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llimview.cpp: CHUI 796 (User doesn't get all messages in 'do not disturb' mode): Now IM DND notifications will be stored as p2p, ad-hoc or group. When loading these notifications upon app start ad-hoc/group notifications will launch the conversation log and play a sound. [f2648f59d0eb]

2013-03-18 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [7cfa25b85b2b]

* indra/newview/llconversationlog.cpp: CHUI-864 ([crashhunters] crash in LLConversationLog): Found a	probable cause. It is likely that the user was missing the user settings variable called 'KeepConversationLogTranscripts.' If this variable doesn't exist or is deleted then the CHUI viewer would try to extract data from this non-existent variable. Resolution, now perform a check to make sure the 'KeepConversationLogTranscripts' settings variable exists before extracting data. [1416eb674152]

2013-03-18 Cho  <cho@lindenlab.com>

* merge [fa8c78a7603f]

* indra/newview/llvoavatar.cpp: CHUI-826 FIX [CHUIBUG]User nametags (nametag floaters) intermittently disappear in CHUI builds. Added check in	LLVOAvatar::idleUpdateNameTagText to account for case where mNameString is literally "" (two quotes) [7cd27e84c671]

2013-03-18 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [770b1b54bc18]

2013-03-15 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/lldelayedgestureerror.cpp: CHUI-852 ([crashhunters] crash in	LLNotificationsUI::LLScreenChannel::addToast): Crash is due to a	gesture not loading while the user is shutting down the app. A	notification saying that the gesture couldn't load is trying to display while the app is shutting down, which causes a crash. [5ed93bcb0a56]

2013-03-18 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-861 FIXED "Animate" param is set false. [28452fe8e0f8]

* indra/newview/skins/default/textures/icons/collapse_to_one_line.png, indra/newview/skins/default/textures/icons/expand_one_liner.png: CHUI-830 Icons uploaded [f253491fd749]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimsession.cpp: CHUI-620 FIXED Clear the highlight when auto-selecting new conversation or when text is entered into the message panel. [e7d0486b1c1c]

2013-03-16 merov

* indra/llrender/llgl.cpp, indra/llui/lltextbase.cpp, indra/newview/llchiclet.cpp, indra/newview/llviewerdisplay.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llworldmapview.cpp: CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux [89a0f1a3fcf4]

2013-03-15 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimview.cpp: Pull merge from lindenlab/viewer-chui [9f78f7d98872]

* indra/llui/lltabcontainer.cpp, indra/newview/llimview.cpp: CHUI-807 : More defensive code. Don't assume anything while iterating through panels. [c0381b636ec8]

2013-03-15 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-831 ADD FIX Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is selected [f04b9c67fb19]

2013-03-13 alexanderpproductengine  <alexanderpproductengine@lindenlab.com>

* indra/newview/llimview.cpp: CHUI-831 ADD FIX Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is selected [2c8c4ec19416]

2013-03-15 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/app_settings/settings.xml, indra/newview/app_settings/settings_per_account.xml, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimsessiontab.cpp: CHUI-816 [CHUIBUG]CHUI does not remember undocked state and position of Nearby Chat [22a0de055779]

2013-03-15 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/app_settings/settings.xml, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h, indra/newview/llimview.cpp, indra/newview/skins/default/textures/textures.xml, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-830 FIXED Button for collapsing torn-off floater(to a single	input line) is added. Show toasts for new messages for that conversation, regardless of other prefs. [ad62113b2186]

2013-03-14 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [3149de17dcb8]

* indra/newview/llimview.cpp: CHUI-853 (Crashing on ejecting member in group): Upon receiving the rejection response message, the incorrect session id was being used to display the message. session_id was being used instead of new_session_id. [a32107447e2a]

2013-03-15 Cho  <cho@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: merge [04c4e3a28c92]

2013-03-14 Cho  <cho@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llpanelpeoplemenus.cpp: CHUI-700 FIX [CHUIBUG]"Zoom in" feature for avatars has disappeared Disabled "Zoom In" menu item in the case where gObjectList.findObject returns nothing [857d1e1905fb]

2013-03-14 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llimview.cpp: merging [ee2d7572e201]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h, indra/newview/llimview.cpp: CHUI-844 (Collapsed conversation panel auto expands when a new IM	conversation starts) CHUI-713 ("Conversations" floater size doesn't	persist between sessions) [2937c5d56064]

2013-03-14 Cho  <cho@lindenlab.com>

* merge [067363c384e2]

* indra/newview/llconversationloglist.cpp, indra/newview/llconversationmodel.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llpanelpeople.cpp, indra/newview/llpanelpeoplemenus.cpp, indra/newview/llpanelpeoplemenus.h,	indra/newview/skins/default/xui/en/menu_conversation.xml, indra/newview/skins/default/xui/en/menu_im_conversation.xml, indra/newview/skins/default/xui/en/menu_people_nearby.xml, indra/new view/skins/default/xui/en/menu_people_nearby_multiselect.xml: CHUI-700 FIX [CHUIBUG]"Zoom in" feature for avatars has disappeared Added "Zoom In" context menu item to Nearby Chat list in People floater and Conversation floater [5937d00c8008]

2013-03-13 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llviewermessage.cpp: CHUI-796 FIXED User doesn't get all messages in 'do not disturb' mode [c2f9c3c07e5d]

2013-03-13 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [d8c895fbba4e]

* indra/newview/llfloaterpreference.cpp, indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-839 : Fixed! Make the LLLineEditor in chat preferences read- only but selectable [1813c3fcefa4]

2013-03-13 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimnearbychat.cpp: CHUI-816 [CHUIBUG]CHUI does not remember undocked state and position of Nearby Chat : canceled the erroneous torn-off/docked state saving when nearby chat is closes [886f44d4012d]

2013-03-15 Nicky Perian  <nickyperian@yahoo.com>

* Merge default [03c8ba523105]

2013-03-14 Nicky Perian  <nickyperian@yahoo.com>

* .hgtags, doc/contributions.txt, indra/llrender/llfontgl.cpp, indra/llui/llurlaction.cpp, indra/newview/app_settings/settings.xml, indra/newview/llavataractions.cpp, indra/newview/llchathistory.cpp, indra/newview/llfloaterpreference.cpp, indra/newview/llvoavatar.cpp, indra/newview/skins/default/xui/en/notifications.xml: Merge viewer-beta [a7a9826c7299]

2013-03-13 Oz Linden  <oz@lindenlab.com>

* .hgtags: Added tag 3.5.0-beta3 for changeset f6ca5bb75bca [dce08ca19097]

* .hgtags: merge changes for DRTVWR-302 [f6ca5bb75bca] [3.5.0-beta3]

* .hgtags: tag merge of DRTVWR-302 [92f9d344c22d]

2013-03-13 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp: build fix [6d91ffd77bf2] [DRTVWR-302]

2013-03-12 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h:	CHUI-847 Fixed [CHUIBUG]Collapse Participant List, operates on all torn off chats: make flag mIsPartListExpanded for saving of the participant list panel expand/collapse state [08267c7916c1]

* indra/newview/llimview.cpp: CHUI-831 Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is	selected : force unminimized of the session's floater [1d42fc277b76]

2013-03-12 Merov Linden  <merov@lindenlab.com>

* indra/llui/lltextbase.cpp: Pull merge from lindenlab/viewer-chui [d8115a6a3192]

* indra/llui/lltextbase.cpp, indra/llui/lltexteditor.cpp, indra/newview/llfloaterimsessiontab.cpp: CHUI-845 : Avoid some xml param parsing error that seems to be	linked with crashers [07dc9c443f81]

2013-03-12 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llrender/llfontgl.cpp: CHUI-846 FIXED [crashhunters] crash in LLFontGL::maxDrawableChars [4e93ba4736d8]

2013-03-12 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/llui/lltextbase.cpp, indra/llui/llurlaction.cpp, indra/llui/llurlaction.h, indra/newview/llavataractions.cpp, indra/newview/llchathistory.cpp, indra/newview/skins/default/xui/en/menu_object_icon.xml, indra/newview/skins/default/xui/en/menu_url_agent.xml, indra/newview/skins/default/xui/en/menu_url_objectim.xml: CHUI-809 FIXED Changes in menu items to make them consistent. Do not start IM if selected person is self. [daf800eb059c]

2013-03-12 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llconversationview.cpp: merge [1413455d168c]

2013-03-11 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h:	CHUI-840 (Right clicking on unselected group conversation can have	unpredictable results for menu options) [c0a78a899c18]

2013-03-11 merov

* Pull merge from lindenlab/viewer-chui [d749bc8f3958]

* indra/newview/app_settings/settings.xml, indra/newview/llspeakers.cpp, indra/newview/llspeakers.h: CHUI-793 : Fixed! Introduced ChatLoadGroupTimeout and ChatLoadGroupMaxMembers to mitigate slow group loading. [1423c9a5f3f8]

2013-03-08 Merov Linden  <merov@lindenlab.com>

* indra/newview/llspeakers.cpp: CHUI-793 : WIP : Limit the number of participants we load on groups when we load from the local group data [0733b009610c]

2013-03-11 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [9983dc041fd3]

* indra/newview/llfloaterpreference.cpp, indra/newview/skins/default/xui/en/notifications.xml: CHUI-778: Adjusted text in prompts for deleting chat log and chat transcripts (per UX). [77f8bac78438]

2013-03-11 merov_linden  <merov_linden>

* doc/contributions.txt, indra/llui/llchatentry.cpp: CHUI-810 : Merged Marine Kelley's patch on selected text and use of	return key in chat [4507b32b9aa5]

2013-03-11 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llconversationloglist.cpp: CHUI-836 FIXED [CHUIBUG]Opening chat history from the conversation log sometimes crashes the viewer [99e755f78a01]

2013-03-11 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llchathistory.cpp: CHUI-815 FIXED Display whispered text in italics and shouted text as	bold [28a14ec6627b]

2013-03-07 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h:	CHUI-821 ADD FIX Conversation size regression when logging out with conversation list minimized to icons: deleted redundant savings of the convers. panel width; added a manually reshape of the conv. panel after change it's collapse state; function with uninformative name "updateState" was renamed to "reshapeFloaterAndSetResizeLimits" [f42d64a64b51]

* indra/newview/llvoavatar.cpp: CHUI-738 FIXED Your own nametag disappears - mysteriously: reset display time when nametag is changes [3fb865484a09]

2013-03-08 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: merge [538a4e50238b]

* indra/llui/llfloater.cpp, indra/llui/llfloater.h,	indra/llui/llfloaterreg.cpp, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimnearbychat.h:	CHUI-835 (ctrl-h does not select nearby chat conversation in list): Modified setVisibleAndFrontMost to now take a arguement for the key that was pressed (if one was pressed). This allows the floater to select the converation line item when becoming visible/frontmost. [fc211dbf28e9]

2013-03-07 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp: CHUI-832 (Different conversation than is selected shown in message	panel after tearing off conversation): Now when a conversation is torn off an adjacent conversation is selected (but not focused). [e5ccc388e0c0]

* indra/newview/llfloaterimcontainer.cpp: merge [ad2f357c81bf]

2013-03-06 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-834 (Conversation selection in conversation list does not	update when redocking torn off conversations): Now when click to	dock a torn off floater, the correct conversation line item will be selected. [1d12cee6e202]

* indra/newview/llfloaterimcontainer.cpp: Merge [7f321633d8b2]

2013-03-05 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp: CHUI-829 (Allow Conversations floater to display a different chat	than the torn off and selected window): Now when selecting a torn off conversation this will not select the conversation line item. [bdc63988037b]

* indra/newview/lllogchat.cpp, indra/newview/lllogchat.h:	CHUI-778: Adjusted deletion of transcripts/logs to be more clean code-wise. [470b8c3be39b]

2013-03-04 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h, indra/newview/lllogchat.cpp: CHUI-778: Now when delete transcripts is pressed the backup files will be deleted as well. Also if clear logs is pressed then backup logs will be cleared. [ec0b50ca9724]

2013-03-08 Cho  <cho@lindenlab.com>

* merging [310783b73ce4]

* indra/newview/llconversationview.cpp, indra/newview/llfloaterimcontainer.cpp: CHUI-772 FIX User sees no notification of conversation activity not visible in long scrolling conversation list Added call to	mConversationsRoot->arrange in	LLFloaterIMContainer::isScrolledOutOfSight [a1c78c0cda0d]

2013-03-07 mberezhnoy  <mberezhnoy@productengine.com>

* indra/llui/lltextbase.cpp: merge [c36c406ba42a]

* indra/llui/lltextbase.cpp: CHUI-823 ([CHUIBUG]Triple-clicking on the scroll back button in the	CHUI causes all the conversation to be selected) [f80801f4e46a]

2013-03-05 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/skins/default/xui/en/menu_url_group.xml: CHUI-764 (Group Profile is not opened after selecting 'Show group	information' in context menu of 'About Land' dialog) [468096459931]

2013-03-07 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-824 FIXED Open Message panel when session is activated. [c740ed10088e]

2013-03-06 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [2efad8a677cd]

* indra/llui/lllineeditor.cpp: CHUI-705 : Fixed! Force hide context menu when deleting line editor widget [b9ccdfbe1bfc]

2013-03-06 Gilbert Gonzales  <gilbert@lindenlab.com>

* Merge [58a69cb5e95e]

2013-03-06 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-821 Clean up code [6449c9284592]

* indra/newview/llfloaterimcontainer.cpp: CHUI-821 Clean up code [787f41d1f2d7]

2013-03-11 Nicky Perian  <nickyperian@yahoo.com>

* indra/cmake/00-Common.cmake, indra/newview/app_settings/logcontrol.xml: compile optimization flag setting default logcontrol.xml [4755e45d8f6d]

2013-02-18 Nicky Dasmijn  <Nicky Dasmijn>

* indra/llcommon/llfasttimer.h: Proper TSC implementation. From Firestorm. Allow compiler optimization to work. Sympton was a startup crash. [906319f9168f]

2013-03-11 Nicky Perian  <nickyperian@yahoo.com>

* indra/newview/skins/default/xui/en/floater_moveview.xml, indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml: Backed out changeset: 8c07c68f76ea nice move floater the fly mode doesn't respond to keyboard move arrows [3190bf782016]

2013-03-09 Nicky Perian  <nickyperian@yahoo.com>

* Merge crash fix and viewer-development upstream merge [c25c9f39196d]

2013-03-08 Nicky Perian  <nickyperian@yahoo.com>

* indra/llcommon/llversionviewer.h, indra/newview/viewerinfo.cpp: set version 3.5.1.27277 [3a1035bb1a42]

* indra/llui/llbutton.cpp, indra/newview/skins/default/xui/en/notifications.xml: KOKUA-1207. Crash at chat button select. Corrected merge error. Client AO bits interferred with CHUI chat handling. * * * notifictions.xml merged with viewer-devlopment [46acaaad27e3]

* Merge viewer-development merge [2a3beff1f7b2]

2013-03-05 Oz Linden  <oz@lindenlab.com>

* merge changes for 3.5.0-beta2 [542ee45430af]

2013-03-07 Nicky Perian  <nickyperian@yahoo.com>

* .hgtags, doc/contributions.txt, indra/llui/llfolderviewitem.cpp, indra/llui/llurlaction.cpp, indra/llvfs/lldir.cpp, indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h,	indra/newview/llviewerwindow.cpp, indra/newview/skins/default/xui/en/notifications.xml: Merge lindenlab viewer-beta [7f3950a19eb7]

2013-03-05 Oz Linden  <oz@lindenlab.com>

* .hgtags: Added tag 3.5.0-beta2 for changeset c6b3561c7d7a [09ceb5cf6c67]

* merge changes for child prim movement [c6b3561c7d7a] [3.5.0-beta2]

2013-03-05 Graham Madarasz (Graham)  <graham@lindenlab.com>

* doc/contributions.txt, indra/newview/lldrawable.cpp: For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934. [3ccb7839fc56]

2013-03-05 Merov Linden  <merov@lindenlab.com>

* Pull from viewer-beta (version number update and tag) [30ccbf37bd66]

2013-03-05 Cho  <cho@lindenlab.com>

* merging [70c371275e4d]

* indra/newview/llconversationview.cpp: CHUI-772 FIX User sees no notification of conversation activity not visible in long scrolling conversation list Added call to	setSelectedSession from LLConversationViewParticipant::handleMouseDown [479e395f0f67]

2013-03-05 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/llui/lltextbase.cpp, indra/llui/llurlaction.cpp, indra/llui/llurlaction.h,	indra/newview/skins/default/xui/en/menu_url_agent.xml: CHUI-809 FIXED "Start IM" menu item is added [35315fae596a]

* indra/newview/llfloaterimnearbychat.cpp: CHUI-815 FIXED Handle SHIFT+ENTER to whisper in Nearby chat [79d49c7e9e09]

2013-03-04 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-822 FIXED Resizing conversation floater with conversation list minimized to icons sets to fixed width that cannot be reduced : set resize limits to conv.panel's minDim when conv. panel is collapsed [97c1583dcc8a]

* indra/newview/llfloaterimcontainer.cpp: CHUI-821 FIXED Conversation size regression when logging out with conversation list minimized to icons : save current conv. panel's	width [a07ea2f6dd81]

2013-03-05 mberezhnoy  <mberezhnoy@productengine.com>

* merge [966d92d7acfb]

2013-03-04 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llimview.cpp: CHUI-806 (IM floater is not become as a top while geting message	with enabled 'Open conversation window' option) [7dd342dbcd59]

2013-03-04 Graham Madarasz (Graham)  <graham@lindenlab.com>

* indra/newview/lldrawable.cpp: For MAINT-2423 fix regression from CHUI merge. Code review: DaveP [319a655f0f72]

2013-03-04 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/skins/default/xui/en/notifications.xml: merge [88d914aa1048]

* indra/newview/llfloaterimnearbychat.h,	indra/newview/llfloaterimsession.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/llfloaterpreference.cpp, indra/newview/lllogchat.cpp: CHUI-778: Now when changing paths for chat logs and transcripts any empty conversations will be reloaded with data from the new location. Use case for this is if the users nearby chat is empty and they switch to a location that has a nearby chat file, then the nearby chat file be loaded. [f12dd12d94e0]

2013-02-25 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationlog.cpp, indra/newview/lllogchat.cpp: CHUI-778: Now when conversation log and trascript files are moved they will not overwrite prior files with the same name. Instead the prior files will be stored as *.backup. [0838f98caca9]

* indra/newview/llconversationlog.cpp: merge [3fa154ef3c53]

* indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h, indra/newview/lllogchat.cpp, indra/newview/lllogchat.h:	merge [4edf1e98dae2]

* merge [54725f35de5d]

* merge [9a9d62ad816d]

* indra/newview/lllogchat.cpp, indra/newview/lllogchat.h:	CHUI-788 (Saving preferences updates text in all open message panels	in conversation floater to show as old messages) Fixed build error for mac/linux [26f03f7e7cd0]

2013-02-22 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationlog.cpp: merge [9650d7392042]

* indra/llvfs/lldir.cpp, indra/llvfs/lldir.h,	indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h, indra/newview/lllogchat.cpp, indra/newview/lllogchat.h,	indra/newview/skins/default/xui/en/notifications.xml: CHUI-778 (Saving preferences updates text in all open message panels	in conversation floater to show as old messages) Now changing the log/transcripts file location actually moves the files to the new location. Prior behavior just started a new history at that location. Also a fix was made so that if the user changed the log/transcripts path then after pressing the Preferences 'OK' button the new location will be saved to the corresponding .xml file. [691774078d53]

2013-02-20 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [9ea8f278eaf8]

* indra/newview/llfloaterpreference.cpp: CHUI-778: Minor changes, prior commit was not changing the file path correctly due to logic error. Also clicking the 'Cancel' in	preferences would still cause the file location to be saved instead of ignore the save. [a7b6ece9801a]

2013-02-19 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [489251ea56a6]

* indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h:	CHUI-778 (Saving preferences updates text in all open message panels	in conversation floater to show as old messages) Problem was that closing the preferences floater was always acting as if the conversation transcripts/log files path had changed. If the path did not change then the user's conversations would be cleared and re- loaded as if they were part of the user's history (causing text to	be grey). Solution: Now keep track of when the path was changed and only load up the transcripts/log upon change. [20b17a448a2e]

2013-03-04 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/skins/default/xui/en/notifications.xml: CHUI-757 FIXED CHUI viewer shows Autopilot cancelled notification toast when interrupting click to walk: - The AutopilotCanceled notification was disabled for this viewer; [13bd66814fe0]

2013-03-01 Merov Linden  <merov@lindenlab.com>

* indra/llui/lltabcontainer.cpp: CHUI-807 : Fixed (attempt) : Defensive coding to prevent potential crash [566d2a0f17eb]

2013-02-28 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-795 FIXED 'Chat history' is enabled but not functional in context menu for friend in Conversation pane while all logs cleared. [d22f19b11375]

2013-03-01 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-794 FIXED Disable context menu options if you select yourself with other participants [5d93af2511ab]

* indra/llui/llfolderviewitem.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/llviewerwindow.cpp: CHUI-694 FIXED Handle ALT + Up/Down and ALT + Right/Left to switch conversations in the list. Handle ALT + Enter to expand participant list of selected conversation. [18fa02a53bbc]

2013-03-01 mberezhnoy  <mberezhnoy@productengine.com>

* merging [08d1311fcfd1]

2013-02-28 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h:	CHUI-789 (Letter m appears in Conversations while exit from outlook	view using 'M' keyboard key) [b56b2bc8b931]

2013-02-27 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/lloutputmonitorctrl.cpp, indra/newview/lloutputmonitorctrl.h:	CHUI-788 FIXED Mute icon not shown in participant list in	conversation floater [5f0accc8aeed]

2010-11-12 Armin Weatherwax  <Armin.Weatherwax@gmail.com>

* indra/newview/skins/default/xui/en/floater_moveview.xml, indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml: nicer move floater [8c07c68f76ea]

2013-03-04 Nicky Perian  <nickyperian@yahoo.com>

* indra/newview/skins/default/xui/en/menu_viewer_kokua.xml: Fine tune top menu [25b548556efb]

* indra/newview/skins/default/xui/en/floater_camera.xml: Fine tune camera floater [5c9fc169219b]

* indra/newview/app_settings/commands.xml, indra/newview/app_settings/toolbars.xml: Default tool bars -- With imprudence flow Conversations on the left Inventory on right. Added some viewer 3 commands. [f985c5bad88f]

2010-11-12 Armin Weatherwax  <Armin.Weatherwax@gmail.com>

* artwork/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_I n_Kokua.png, artwork/indra/newview/skins/default/textures/bottomtray /Cam_Rotate_Out_Kokua.png, artwork/indra/newview/skins/default/textu res/bottomtray/Cam_Tracking_In_Kokua.png, artwork/indra/newview/skin s/default/textures/bottomtray/Cam_Tracking_Out_Kokua.png, indra/newview/llfloatercamera.cpp, indra/newview/llfloatercamera.h,	indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png, indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png, indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png, indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png , indra/newview/skins/default/textures/textures.xml, indra/newview/skins/default/xui/en/floater_camera.xml: nicer cam floater [a73616293328]

* indra/newview/llviewermenu.cpp, indra/newview/skins/default/xui/en/menu_login_kokua.xml, indra/newview/skins/default/xui/en/menu_viewer_kokua.xml: byebye Me menu. WB File Edit View menus

Build Advanced + Develop are not changed to avoid confusion of users used to their design. [aefc397f9f41]

2013-03-03 Nicky Perian  <nickyperian@yahoo.com>

* indra/llcommon/llversionviewer.h, indra/newview/viewerinfo.cpp: Streaming audio fixed with previous 4 changesets. Bumped for Experimental to Beta and version to 3.5.1.27239 [8b1d92d9360f]

* indra/media_plugins/webkit/windows_volume_catcher.cpp: Backed out changeset: 46284eee7670 FIX (SPECULATIVE) MAINT-1340 - Media Volume control broken on Vista+ systems [2f6aa8aaf833]

* Backed out changeset: 5df4802bec93 MAINT-1340 fix line endings [c78bd2a112bd]

* indra/media_plugins/webkit/windows_volume_catcher.cpp: Backed out changeset: 948196f30522 MAINT-2281 correct test for XP	[210838a30f5f]

* indra/media_plugins/webkit/windows_volume_catcher.cpp: Backed out changeset: 1567de5700c2 MAINT-2281 correct test for XP	[f3e512a814f9]

2013-02-27 Nicky Perian  <nickyperian@yahoo.com>

* indra/llcommon/llversionviewer.h, indra/newview/viewerinfo.cpp: Version to 3.5.1 CHUI [60555fda5eae]

* indra/llcommon/llavatarname.h, indra/llui/llbutton.cpp, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/newview/fspanelprofile.cpp, indra/newview/llnotificationhandler.h:	CHUI tweaks [16caa60638e6]

2013-02-26 Nicky Perian  <nickyperian@yahoo.com>

* .hgtags, indra/CMakeLists.txt, indra/cmake/CMakeLists.txt, indra/llcommon/CMakeLists.txt, indra/llcommon/llmemory.h,	indra/llcommon/llversionviewer.h,	indra/llmessage/llinstantmessage.cpp, indra/llrender/llvertexbuffer.cpp, indra/llui/llbutton.cpp, indra/llui/llbutton.h, indra/llui/llcommandmanager.cpp, indra/llui/llcommandmanager.h, indra/llui/llfolderviewitem.cpp, indra/llui/llmenugl.cpp, indra/llui/llnotificationslistener.cpp, indra/llui/llnotificationslistener.h,	indra/llui/llscrolllistctrl.cpp, indra/llui/llspinctrl.cpp, indra/llui/lltextbase.h, indra/llui/lltoolbar.cpp, indra/llui/llurlentry.cpp, indra/llvfs/lldir.cpp, indra/media_plugins/gstreamer010/CMakeLists.txt, indra/newview/CMakeLists.txt, indra/newview/app_settings/commands.xml, indra/newview/app_settings/settings.xml, indra/newview/app_settings/settings_per_account.xml, indra/newview/llappviewer.cpp, indra/newview/llavataractions.cpp, indra/newview/llavataractions.h, indra/newview/llcallfloater.cpp, indra/newview/llcallfloater.h, indra/newview/llchathistory.cpp, indra/newview/llchatitemscontainerctrl.cpp, indra/newview/llface.cpp, indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h,	indra/newview/llfloaterreporter.cpp, indra/newview/llfloatertools.cpp, indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfoldervieweventlistener.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h, indra/newview/llgrouplist.cpp, indra/newview/llgrouplist.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llinventoryfunctions.cpp, indra/newview/llinventorymodel.cpp, indra/newview/llinventorymodel.h,	indra/newview/llinventorypanel.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h, indra/newview/llnearbychatbar.cpp, indra/newview/llnearbychatbar.h,	indra/newview/llnearbychatbarlistener.cpp, indra/newview/llnearbychatbarlistener.h,	indra/newview/llnearbychathandler.cpp, indra/newview/llnearbychathandler.h,	indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llpanelmarketplaceoutboxinventory.h,	indra/newview/llstartup.cpp, indra/newview/lltoolbarview.cpp, indra/newview/lltoolpie.cpp, indra/newview/llvieweraudio.cpp, indra/newview/llviewerfloaterreg.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermenu.h,	indra/newview/llviewermessage.cpp, indra/newview/llviewerobject.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoicevivox.cpp, indra/newview/llvopartgroup.cpp, indra/newview/llvovolume.cpp, indra/newview/llworld.cpp, indra/newview/pipeline.cpp, indra/newview/skins/default/colors.xml, indra/newview/skins/default/textures/bottomtray/Unread_IM.png, indra /newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png, i	ndra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.pn	g, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dar k.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_ Dark.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_O n_Dark.png, indra/newview/skins/default/textures/textures.xml, indra/newview/skins/default/xui/da/menu_im_well_button.xml, indra/newview/skins/default/xui/de/menu_im_well_button.xml, indra/newview/skins/default/xui/en/floater_chat_bar.xml, indra/newview/skins/default/xui/en/floater_voice_controls.xml, indra/newview/skins/default/xui/en/menu_im_well_button.xml, indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml, indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml, indra /newview/skins/default/xui/en/menu_people_friends_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml, indra/newview/skins/default/xui/en/menu_viewer.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/panel_activeim_row.xml, indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml, indra/newview/skins/default/xui/en/panel_group_control_panel.xml, indra/newview/skins/default/xui/en/panel_im_control_panel.xml, indra/newview/skins/default/xui/en/panel_preferences_colors.xml, indra/newview/skins/default/xui/en/strings.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml, indra /newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml, indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xm	l, indra/newview/skins/default/xui/es/menu_im_well_button.xml, indra/newview/skins/default/xui/fr/menu_im_well_button.xml, indra/newview/skins/default/xui/it/menu_im_well_button.xml, indra/newview/skins/default/xui/ja/menu_im_well_button.xml, indra/newview/skins/default/xui/pl/menu_im_well_button.xml, indra/newview/skins/default/xui/pt/menu_im_well_button.xml, indra/newview/skins/default/xui/ru/menu_im_well_button.xml, indra/newview/skins/default/xui/tr/menu_im_well_button.xml, indra/newview/skins/default/xui/zh/menu_im_well_button.xml, indra/win_crash_logger/CMakeLists.txt: Merge CHUI [0c4b59c8a9fb]

2013-02-25 Oz Linden  <oz@lindenlab.com>

* indra/llcommon/llversionviewer.h:	increment version to 3.5.1 [699be90ca9ea]

* .hgtags: Added tag 3.5.0-beta1 for changeset 9b19edaf1d8d [0cdd0a017f54]

* indra/llcommon/llversionviewer.h:	increment minor version: 3.5.0 [9b19edaf1d8d] [3.5.0-beta1]

* .hgtags: tag merge of DRTVWR-288 [c1f6030d9577]

2013-02-25 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [279ef1dfc9b7] [DRTVWR-288]

* indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h:	CHUI-778: Pushing a quick fix that only pertains to CHUI-778 so we can close out this issue. [db4a916cd0de]

2013-02-25 Cho  <cho@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h:	merging [03b5bed41ce5]

2013-02-22 Cho  <cho@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h:	CHUI-772 FIX User sees no notification of conversation activity not visible in long scrolling conversation list Renamed LLFLoaterIMContainer::isConversationItemWidgetvisible to	isScrolledOutOfView with opposite return value [83b9bc56bdd2]

* indra/newview/llconversationview.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h:	CHUI-772 FIX User sees no notification of conversation activity not visible in long scrolling conversation list Added LLFLoaterIMContainer::isConversationItemWidgetvisible which is now used in LLConversationViewSession::startFlashing to flash chat toolbar button if out of view [7e98f33136e7]

2013-02-22 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llavataractions.cpp, indra/newview/llfloaterconversationpreview.cpp, indra/newview/llfloaterconversationpreview.h,	indra/newview/lllogchat.cpp, indra/newview/lllogchat.h,	indra/newview/llpanelpeoplemenus.cpp: CHUI-633 FIXED User is not able to open chat history by 'View chat history' menu item from pop-up menu of People floater [7dbea1c29b79]

2013-02-25 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llpanelpeople.cpp: CHUI-790 FIXED Just disable "+" if selected participant is your own avatar [3e23587f1ff0]

2013-02-23 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/vieewer-chui [b0c3bf7a1790]

* indra/llui/llfloater.cpp, indra/llui/llfloaterreg.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimnearbychat.h: CHUI-568 : Fixed! Implemented Ctrl-H for Nearby Chat, taking into account the existence of other conversations and docked/torn off state [b438f565db0f]

2013-02-21 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfloater.cpp, indra/llui/llfloater.h,	indra/llui/llfloaterreg.cpp, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimnearbychat.h,	indra/newview/skins/default/xui/en/menu_viewer.xml: CHUI-568 : WIP : Introduced Ctrl-T and Ctrl-H for conversations and nearby chat [db6aa30a744d]

2013-02-22 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h:	CHUI-781 FIXED Select conversation if user selects participant that belongs to this conversation. [5fbe8166a62a]

* indra/newview/llconversationview.cpp: CHUI-702 FIXED Calling requestArrange in refresh has to fix the problem. [fa9d9ef7245f]

2013-02-21 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llnotificationofferhandler.cpp: CHUI-774 FIXED Play a sound even if the conversation floater is open and conversation with user is the active. [b6e7d35c6981]

* indra/newview/llconversationlog.cpp: CHUI-783 FIXED Load logs from conversation.log file after changing preferences. [e49ffedb43fa]

2013-02-20 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-784 FIXED Crash when closing expanded group chat [dcc746e49a39]

2013-02-19 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-756 Minimized chat opens when start new conversation : saving of the minimized state of an session floater [31a008dd7e81]

2013-02-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-768 ADD FIX Conversation panel resize issue with message panel collapse : correctly assign of a left panel resize limits [f4f413d13b3f]

* indra/newview/llimview.cpp: CHUI-773 ADD FIX Conversation line item does not flash for unselected conversation when Flash Toolbar Button preference is	selected : repair case "open and not on top" [fad8359325a0]

2013-02-20 Merov Linden  <merov@lindenlab.com>

* indra/newview/llspeakers.cpp: CHUI-395 : Fixed! Check the moderator status in the group data when loading the group list [8862a6d87239]

2013-02-20 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llinspectavatar.cpp, indra/newview/skins/default/xui/en/inspect_avatar.xml: CHUI-590 FIXED Put voice volume control back into avatar inspector. [17f578c64f34]

2013-02-19 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-729 FIXED Messages pane displays incorrect after changing size and relogin [da59fec3bff2]

2013-02-18 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llui/llfloater.h, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h:	CHUI-729 FIXED Messages pane displays incorrect after changing size and relogin [ee6110f27d68]

2013-02-19 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llconversationview.cpp: CHUI-702 FIXED Call requestArrange after showing Voice indicator to avoid overlapping. [11b41130b749]

2013-02-18 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-768 Conversation panel resize issue with message panel collapsed : manually resize of the conversations panel [36650a2745a3]

2013-02-18 Richard Linden  <Richard Linden>

* indra/llcommon/llinitparam.h:	Automated merge with https://bitbucket.org/lindenlab/viewer-chui [2a0bea4ea145]

* indra/llcommon/llinitparam.h:	CHUI-739 FIX FUI toolbars not displayed when switching between CHUI and release viewer param blocks no longer write enums as ints [b9d3bcee5145]

2013-02-18 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterpreference.cpp, indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-779 FIXED Chat log preferences are disabled before login. [aec24d1138ea]

2013-02-15 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-767 First click on << icon in a session to collapse message panel has no action : delete an obsolete (after the changeset	1cbf27ea0b4e) code [ff215ea2ab46]

2013-02-18 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llconversationlog.cpp: CHUI-775 FIXED We should always handle changing of preferences. [77aee5ba5f71]

* indra/newview/llfloaterpreference.cpp: CHUI-742 FIXED Do not update Log locations immediately after selecting a new location. [d5690e3275dd]

2013-02-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-773 Conversation line item does not flash for unselected conversation when Flash Toolbar Button preference is selected: add flashing in "toast" case when session floater is open but not selected [e3d94c14855f]

2013-02-15 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llconversationlog.cpp: CHUI-755 FIXED cache is called to update conversation.log file after deleting conversations. [f8611642d181]

* indra/newview/llnotificationofferhandler.cpp: CHUI-774 Fixed condition of the checking. Also the sound for Teleport offer will be played correctly now. [d958981eb225]

2013-02-14 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [f65c7f890236]

* indra/llui/llfloater.cpp: CHUI-753 : Fixed (temptative) : Added some defensive coding in bringToFront to make safer or avoid pointer casting. [3a218312285d]

2013-02-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llcommon/llinitparam.h:	CHUI-739 : Clean up : FUI toolbars not displayed when switching between CHUI and release viewer [82df7ab6abcf]

2013-02-13 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llcommon/llinitparam.h, indra/newview/lltoolbarview.cpp: CHUI-739 Fixed! FUI toolbars not displayed when switching between CHUI and release viewer : parsing declare values of Enums [31f55ab9136f]

2013-02-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-771 Fixed! Conversation not scrolled to in conversation list when clicking on toast: add scrolling to selected widget [c2afca3f5039]

2013-02-13 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [0b41ec4b815c]

* indra/newview/lltoastnotifypanel.cpp: CHUI-695: When the 'Accept' button is pressed the toast panel will be resized to the conversation floater dimensions after all buttons and text has been added to the toast panel [c64d565a7861]

2013-02-12 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [a8deb5f85089]

* indra/newview/lltoastnotifypanel.cpp, indra/newview/lltoastnotifypanel.h, indra/newview/lltoastpanel.cpp, indra/newview/lltoastpanel.h:	CHUI-695: Viewer crash when accepting friend offer in conversations window. Problem was that LLIMToastNotifyPanel::snapToMessageHeight was calling LLToastPanel::reshape, which would then call LLIMToastNotifyPanel::reshape again. Resolution: Modified LLIMToastNotifyPanel::snapToMessageHeight to cleanly replicate what LLToastPanel::reshape was doing. [8d7c03ddc01a]

* indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llviewermessage.cpp: CHUI-758: Group notice received in DND mode causes crash on startup when 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. [d817dfd5a3cb]

2013-02-13 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [cb8c93f97ee3]

* indra/newview/llfavoritesbar.cpp: CHUI-770 : Fixed! Need to use the User Name and not the Account Name to save the favorites. [8d4ba39c1a87]

2013-02-13 Cho  <cho@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: merging [c97a94283ea2]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle	mute this participant" Added new LLFloaterIMContainer::visibleContextMenuItem connected to	"Avatar.VisibleItem" [2a1c082933fa]

* merging [92614460a6c9]

* indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle	mute this participant" Made mute and unmute invisible instead of	disabled when not available [9839e5219e9b]

2013-02-12 Cho  <cho@lindenlab.com>

* merging [5c2259157dee]

* merging [3fd2f76e7258]

* indra/newview/llconversationmodel.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle	mute this participant" Reverted changes in menu_conversation.xml, llconversationmodel.cpp, and llfloaterimcontainer.cpp [8b679ca94342]

2013-02-13 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/skins/default/xui/en/notifications.xml: CHUI-769 FIXED The text of the dialog is changed. [9b2b7d459acb]

* indra/newview/llconversationlog.cpp: CHUI-761 FIXED Clear log button will not clear transcripts. [3c17fbbea6b9]

* indra/newview/llfloaterimcontainer.cpp: CHUI-737 FIXED Reselect current conversation when floater is opened. [f14e743385c3]

* indra/newview/llpanelpeople.cpp, indra/newview/llpanelpeoplemenus.cpp, indra/newview/llworld.cpp, indra/newview/skins/default/xui/en/menu_people_nearby.xml: CHUI-765 FIXED User's name is added to the list in Nearby tab. [c00564a59dd3]

2013-02-13 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/app_settings/settings_per_account.xml, indra/newview/llstartup.cpp: CHUI-743 FIXED CHUI viewer ignores pre chui users Privacy settings to not keep IM logs and nearby chat logs [3fdd1959bf6b]

2013-02-12 Merov Linden  <merov@lindenlab.com>

* .hgtags: Pull merge from lindenlab/viewer-development [7766988d2c52]

2013-02-12 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h: CHUI-742 FIXED Update log location when closing Preference floater. [8c8db5c9ab8b]

2013-02-11 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [ab4bd4c28804]

* indra/newview/llplacesinventorypanel.cpp: CHUI-690 : Fixed! Prevent xml parsing error when building Places panel providing an option menu to the LLFolderView constructor [424b132a1dc2]

2013-02-11 Cho  <cho@lindenlab.com>

* merging [8b06da751898]

* indra/newview/llconversationlog.cpp: CHUI-760 FIX Conversation.log file not saved in user specified location Changed LLConversationLog::getFileName to use LL_PATH_PER_ACCOUNT_CHAT_LOGS instead of LL_PATH_PER_SL_ACCOUNT [772f30088971]

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h, indra/newview/llimview.cpp: CHUI-755 FIX Conversation log changes in a session are lost if	viewer crashes Added call to LLConversationLog::instance.cache after LLLogChat::SaveHistory in LLIMView::logToFile [2b57deed3be4]

2013-02-11 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [690573304398]

2013-02-08 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [8ec8fda4428c]

* indra/newview/lltoastnotifypanel.cpp, indra/newview/skins/default/xui/en/panel_notification.xml: CHUI-747: Script buttons in a toast overlap message text. Problem was due to the message container not being shifted upward when buttons were added to the control buttons container (which is	beneath the message container). A small change in CHUI-695 caused this. [07b239c14992]

2013-02-11 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-728 FIXED Don't display Nearby chat participants if Conversation pane is collapsed. [d0dc435153fc]

* indra/llui/lltextbase.cpp, indra/llui/lltextbase.h: CHUI-751 FIXED Triple click is now handled. [12b215307c76]

2013-02-11 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llinventorypanel.cpp: Fix for build issue under windows [aa425f2a8613]

2013-02-08 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llui/lltextbase.cpp: CHUI-731 FIXED Viewer crashed while deleting text from IM message [056c657c3386]

2013-02-09 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: merging [3a2584150702]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp: CHUI-713 "Conversations" floater size doesn't persist between sessions additional fix [705f496d7e1e]

2013-02-07 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp: CHUI-713 "Conversations" floater size doesn't persist between sessions [1cbf27ea0b4e]

2013-02-08 Merov Linden  <merov@lindenlab.com>

* indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanelmaininventory.cpp: CHUI-735 : Fixed! Refactor the code to move isSelectionRemovable to the LLInventoryPanel level. Use it when using the delete key. [5269d8dee794]

* Pull merge from lindenlab/viewer-chui [574db9a27b5d]

* indra/newview/llpaneloutfitedit.cpp, indra/newview/skins/default/xui/en/menu_cof_gear.xml: CHUI-746 : Fixed! Undid the MAINT-2276 hack now that submenus do	work thanks to CHUI-682 [59cb0c37f91a]

2013-02-08 Cho  <cho@lindenlab.com>

* merging [c7e76be6cf1f]

* indra/llui/lldockcontrol.cpp, indra/llui/lldockcontrol.h:	CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated after relogin while group invitation Renamed LLDockControl::mDockWidget to mDockWidgetHandle for clarity [846cbc229cda]

* indra/llui/lldockcontrol.cpp, indra/llui/lldockcontrol.h,	indra/newview/llpersistentnotificationstorage.cpp: CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated after relogin while group invitation Changed LLPersistentNotificationStorage::saveNotification to use notification->asLLSD(true) to skip duplicates Changed LLDockControl::mDockWidget to be a LLHandle<LLView> instead of a	LLView* to fix crash (from accessing deleted LLView) [c1c5cd03ed8c]

2013-02-07 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimview.cpp: CHUI-736: When auto-exit DND mode upon startup, stored conversations are not highlighted. When the dnd im is processed, now flash the conversation line item. [9b74f91440e1]

2013-02-07 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [f4ec155e6e64]

* indra/llui/llfolderview.cpp, indra/newview/llinventorypanel.cpp: CHUI-735 : Fixed! Handle the backspace case, suppress the search string handling from LLFolderView (it's in the search edit field	now). [98952bd77b3c]

2013-02-07 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/skins/default/xui/en/floater_conversation_log.xml, indra/newview/skins/default/xui/en/floater_conversation_preview.xml: CHUI-722 Fixed! Add ? button to titlebar on floaters: Conversation Log, Nearby Chat History, and IM History [74b6c7b78260]

2013-02-06 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [46e6dd0d59db]

* indra/llui/llfolderview.cpp, indra/llui/llfolderview.h,	indra/newview/llinventorypanel.cpp: CHUI-735 : Fixed! Move the delete key handling from the llfolderview to the llinventorypanel level. [1a92e441aafc]

2013-02-06 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llfloaterpreference.cpp, indra/newview/lllogchat.cpp, indra/newview/lllogchat.h:	CHUI-712 FIXED IM log files renamed with ll.txt will create double files for users [f4241ba8a6ca]

2013-02-06 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/lltoolbar.cpp: CHUI-707: "Chat" toolbar button stop flashing after setting toolbar buttons view to "Icons only": save/restore flashing states [81d0137d734e]

2013-02-06 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/app_settings/settings.xml, indra/newview/app_settings/settings_per_account.xml, indra/newview/llconversationlog.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llimview.cpp: CHUI-744 FIXED KeepConversationLogTranscripts setting is moved to	settings_per_account.xml [8316486e3c3b]

2013-02-06 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h:	merge [fb3bee60723f]

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llconversationloglist.cpp, indra/newview/llfloaterconversationlog.cpp, indra/newview/llfloaterconversationlog.h,	indra/newview/skins/default/xui/en/floater_conversation_log.xml, indra/newview/skins/default/xui/en/strings.xml: CHUI-597 (Messages shown in Conversation Log are inaccurate) Added messages, for now they're displayed in two cases: 1) no log entries,	logging disabled 2) no log entries, logging enabled Case when there are existing log entries and logging is disabled is still under discussion [1d2cccca5637]

2013-02-06 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterimnearbychat.cpp: CHUI-716 FIXED Call onClickCloseBtn to avoid complete disappearing of torn off Nearby chat. [0549a127c084]

2013-02-05 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-677 : Fixed! Use the selected session for doToSelectedGroup, not the selected item. [50cf31103ea0]

* Pull merge from lindenlab/viewer-chui [ed7d29c0404d]

* indra/newview/llinventorybridge.cpp: CHUI-730 : Fixed! Only clear out More sub menus in inventory [71309168f89b]

2013-02-04 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/lltoastnotifypanel.cpp, indra/newview/lltoastpanel.cpp, indra/newview/skins/default/xui/en/panel_notification.xml: CHUI-695 FIXED Viewer crashes after attempt to accept a friendship in IM	[bd3f12ecb41f]

2013-02-04 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [e6e8e906a40e]

* indra/llui/llfolderview.cpp: CHUI-732 : Fixed! Do not iterate through selection while modufying it at the same time, use a temp set. [fa79aaad2f00]

2013-02-04 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [195901dddfb1]

* merge [b53735ade377]

2013-02-01 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [0fcee2fc8aad]

* indra/newview/llnotificationscripthandler.cpp, indra/newview/llviewermessage.cpp: CHUI-691: Now when an estate message is received while in DND mode, a toast notification will appear. [ee56d2a55832]

2013-02-04 Merov Linden  <merov@lindenlab.com>

* Pull merge from lindenlab/viewer-chui [b87b62c7b7a5]

* indra/newview/llimview.cpp: CHUI-677 : Added a warning printout in the log to capture context of this bug. [eea85d2ec796]

2013-02-04 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llfloaterpreference.cpp: CHUI-721 FIXED Delete transcripts when performing Clear log action. [e0cc06ee77ef]

2013-02-02 Cho  <cho@lindenlab.com>

* merging [1d26d606698b]

2013-02-01 Cho  <cho@lindenlab.com>

* indra/llui/llmenugl.cpp: CHUI-720 FIX User can open "Add friend" by pressing on a line in	context menu for user that already is friend Added check for getVisible and getEnabled before passing along handleMouseDown and handleMouseUp callbacks to other menu items in	LLMenuItemSeparatorGL [d36e50139380]

* indra/newview/llavatarlist.cpp, indra/newview/llavatarlist.h,	indra/newview/llavatarlistitem.cpp, indra/newview/llavatarlistitem.h,	indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsession.h:	CHUI-675 FIX You can select multiple users in people floater but can only drag and drop one name to conversation Moved drag and drop start in LLAvatarListItem instead of LLAvatarList, and made LLFloaterIMSession handle multiple dropped participants correctly [4167763baf85]

2013-02-01 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge [3da762ad40ae]

* indra/newview/llnotificationscripthandler.cpp, indra/newview/llviewermessage.cpp: CHUI-689: When DND mode is enabled, making a direct delivery purchase 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). [a5d72f0a1078]

2013-02-01 Mnikolenko ProductEngine  <mnikolenko@productengine.com>

* indra/newview/llfloaterconversationlog.cpp: CHUI-715 FIXED Disable Gear button if no conversation is selected [daaba0481dcb]

2013-02-01 mberezhnoy  <mberezhnoy@productengine.com>

* indra/linux_updater/CMakeLists.txt, indra/linux_updater/linux_updater.cpp, indra/llcommon/llfasttimer_class.cpp, indra/llcommon/llfasttimer_class.h, indra/llcommon/llmemtype.cpp, indra/llcommon/llmemtype.h, indra/newview/llconversationlog.cpp, indra/newview/llimview.cpp, indra/newview/llmemoryview.cpp, indra/newview/llmemoryview.h:	merging [70dcd49a0d10]

2013-01-31 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llconversationlog.cpp, indra/newview/llimview.cpp: CHUI-718 (User does not see own chat in conference IM) CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name	appears, after ejecting any member from group) [8dd4a13b66e6]

2013-01-31 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llimview.cpp: CHUI-612 FIXED Blank conversation names showing in conversation list [f3347320ce41]

2013-01-31 maxim  <maxim@mnikolenko>

* indra/linux_updater/CMakeLists.txt, indra/linux_updater/linux_updater.cpp, indra/llcommon/llfasttimer_class.cpp, indra/llcommon/llfasttimer_class.h, indra/llcommon/llmemtype.cpp, indra/llcommon/llmemtype.h, indra/newview/llmemoryview.cpp, indra/newview/llmemoryview.h:	Merge [371e8133349a]

* indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-719 FIXED Font color was changed. [ca1130f15366]

2013-01-31 Merov Linden  <merov@lindenlab.com>

* Pull merge with lindenlab/viewer-chui [5bd491af6e1c]

2013-01-30 Merov Linden  <merov@lindenlab.com>

* .hgtags, indra/CMakeLists.txt, indra/linux_updater/CMakeLists.txt, indra/linux_updater/linux_updater.cpp, indra/llcommon/CMakeLists.txt, indra/llcommon/llfasttimer_class.cpp, indra/llcommon/llfasttimer_class.h, indra/llcommon/llinitparam.h,	indra/llcommon/llmemory.h, indra/llcommon/llmemtype.cpp, indra/llcommon/llmemtype.h, indra/llinventory/llinventory.h,	indra/llmath/tests/alignment_test.cpp, indra/llmessage/llcachename.cpp, indra/llrender/llvertexbuffer.cpp, indra/llui/llfloater.cpp, indra/llui/llfloater.h,	indra/llui/llmenugl.cpp, indra/llui/llmenugl.h,	indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/llui/llresizebar.cpp, indra/llui/lltexteditor.cpp, indra/llui/lltexteditor.h, indra/llui/lltoggleablemenu.h,	indra/llui/lltoolbar.cpp, indra/llui/lltooltip.cpp, indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llappviewer.cpp, indra/newview/llchathistory.cpp, indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/lldrawable.cpp, indra/newview/llface.cpp, indra/newview/llflexibleobject.cpp, indra/newview/llfloatercolorpicker.cpp, indra/newview/llfloaterland.cpp, indra/newview/llfloatertools.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventoryfunctions.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llmemoryview.cpp, indra/newview/llmemoryview.h,	indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationstorage.cpp, indra/newview/llpanellandmarks.cpp, indra/newview/llpanellandmarks.h,	indra/newview/llpanelmaininventory.cpp, indra/newview/llpaneloutfitedit.cpp, indra/newview/llpaneltopinfobar.cpp, indra/newview/llsidepanelappearance.cpp, indra/newview/llspatialpartition.cpp, indra/newview/llstartup.cpp, indra/newview/lltexturefetch.cpp, indra/newview/lltoolbarview.cpp, indra/newview/lltoolpie.cpp, indra/newview/llviewerkeyboard.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermenu.h,	indra/newview/llviewermessage.cpp, indra/newview/llviewerobject.cpp, indra/newview/llviewerobject.h,	indra/newview/llviewerobjectlist.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llviewerwindow.h,	indra/newview/llvoavatar.cpp, indra/newview/llvopartgroup.cpp, indra/newview/llvovolume.cpp, indra/newview/pipeline.cpp, indra/newview/pipeline.h,	indra/newview/skins/default/xui/en/menu_viewer.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/strings.xml: Pull merge from lindenlab/viewer-developement [2e689d104238]

2013-01-31 maxim  <maxim@mnikolenko>

* indra/newview/llconversationlog.cpp: CHUI-711 FIXED Load logs from file only once to avoid duplicating. This will also solve problem with chui-710. [096703a77e1e]

2013-01-30 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llconversationlog.cpp, indra/newview/llimview.cpp: merging [3f711813829f]

* indra/newview/llconversationlog.cpp, indra/newview/llimview.cpp: CHUI-704 (Entry in 'Conversation Log' floater with your avatar's	name appears, after ejecting any member from group) [51920c0f0388]

2013-01-30 Cho  <cho@lindenlab.com>

* merging latest changes [b53a68beb64c]

* merging latest changes [c5f4ec72df18]

* indra/newview/llavataractions.cpp: CHUI-647 FIX "Conversations" floater is not opened when user wants to share something via "Conversation log" floater Added call to show conversations floater in LLAvatarActions::share [c938f7c82e6b]

2013-01-29 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimview.cpp: Pull merge from lindenlab/viewer-chui [46c9ce27d8ab]

* indra/newview/llimview.cpp: CHUI-436 : Fixed : Do not skip yourself or group chat when checked Only friends and groups can call or IM me pref.	[833eba85af4b]

2013-01-29 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimview.cpp: CHUI-88 I shouldn't see Conference IMs from people I muted. Fix: In	order to mute a user who initiated a conference/group chat, the session must be created on the server side and then left. [72a17ee4e16b]

* merge [9e35655b7883]

* indra/newview/llappviewer.cpp: CHUI-667: Attempting to correct Mac/Linux build issue. [11fdcfa598b2]

2013-01-28 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llaudio/llaudioengine.cpp, indra/llaudio/llaudioengine.h,	indra/newview/llappviewer.cpp, indra/newview/lldeferredsounds.cpp, indra/newview/lldeferredsounds.h:	CHUI-667: Post code review changes [0da137e1afee]

* merge [8eb210419784]

2013-01-25 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llui.cpp, indra/llui/llui.h,	indra/newview/CMakeLists.txt, indra/newview/llappviewer.cpp, indra/newview/lldeferredsounds.cpp, indra/newview/lldeferredsounds.h,	indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llnotificationofferhandler.cpp, indra/newview/llprogressview.cpp, indra/newview/llvieweraudio.cpp: CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played. [6fad868f2f13]

2013-01-29 Cho  <cho@lindenlab.com>

* indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimsession.cpp, indra/newview/llimview.cpp: merging latest changes [196c8b999d19]

* indra/newview/llfloaterimsession.cpp, indra/newview/llimview.cpp: CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication Console Immediately. Removed new code from on_new_message in LLIMView and instead, changed condition in	LLFloaterIMSession::newIMCallback to update messages whenever the floater is visible [a57a54f3c620]

2013-01-26 Cho  <cho@lindenlab.com>

* indra/newview/llimview.cpp: undid accidental revert of someone else's fix [49b9ba716eff]

* indra/newview/llimview.cpp: CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication Console Immediately. Added call to	LLFloaterIMContainer::selectConversation in on_new_message for LLIMView [53667b432058]

2013-01-25 Cho  <cho@lindenlab.com>

* merging latest changes [2735a2a4c4f5]

* indra/llui/lltexteditor.cpp, indra/llui/lltexteditor.h,	indra/newview/llautoreplace.cpp, indra/newview/llautoreplace.h,	indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimsession.cpp: CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater Modified LLAutoReplace to pass back a string for replacement instead of modifying the input string [b4bb6f1a7434]

* indra/llui/lltexteditor.cpp, indra/llui/lltexteditor.h,	indra/newview/llfloaterimnearbychat.cpp: CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater Fixed autoreplace in	LLTextEditor so it updates correctly and works with undo [32fa63a97f91]

2013-01-29 Cho  <cho@lindenlab.com>

* indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimsession.cpp: merging latest changes [83d3553fa73f]

2013-01-25 Cho  <cho@lindenlab.com>

* merging latest changes [20f8c5ac1017]

2013-01-23 Cho  <cho@lindenlab.com>

* merging latest changes [a5a22b63cc5d]

* indra/llui/lllineeditor.cpp, indra/llui/lllineeditor.h,	indra/llui/lltexteditor.cpp, indra/llui/lltexteditor.h,	indra/newview/llautoreplace.cpp, indra/newview/llautoreplace.h,	indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimsession.cpp: CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater Moved autoreplace hooks from LLLineEditor to LLTextEditor, and modified LLAutoReplace accordingly [4f818589f755]

2013-01-28 Merov Linden  <merov@lindenlab.com>

* indra/viewer_components/updater/tests/llupdaterservice_test.cpp: Fix test failure [14cc2d9eec0a]

2013-01-28 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp: merge [8471065a1053]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llfloaterimsessiontab.cpp: CHUI-395 (Group moderators are not shown as Moderators in group	conversation) [f5ad3afd3fcf]

2013-01-24 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llvfs/lldir.cpp, indra/llvfs/lldir.h,	indra/newview/app_settings/settings.xml, indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llfloaterconversationlog.cpp, indra/newview/llfloaterconversationlog.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimnearbychat.h,	indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsession.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h, indra/newview/llimview.cpp, indra/newview/llimview.h, indra/newview/lllogchat.cpp, indra/newview/lllogchat.h, indra/newview/llviewermessage.cpp, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/panel_preferences_chat.xml, indra/newview/skins/default/xui/en/panel_preferences_privacy.xml: CHUI-578 FIXED Move preferences for conversation logs/transcripts to	chat tab [91c03a96d849]

2013-01-28 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp: CHUI-708 FIXED Call doToParticipants only if selected conversation is p2p [b1dc0e50bc1b]

* indra/newview/skins/default/xui/en/menu_url_group.xml: CHUI-706 FIXED Appropriate function is now called in xml [30128ed65178]

* indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llimview.cpp: CHUI-701 FIXED Don't show toasts and flashing, if conversation is opened but isn't focused. [05b5a481a3d3]

2013-01-23 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/lltoastnotifypanel.cpp, indra/newview/lltoastpanel.cpp: CHUI-695 Viewer crashes after attempt to accept a friendship in IM: remove an infinity loop of reshape [12c1afdd9600]

2013-01-25 maxim  <maxim@mnikolenko>

* indra/newview/llviewermessage.cpp: CHUI-697 FIXED We don't need to update form for Inventory offer notification [c7634b88cae1]

2013-01-24 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llfloaterimcontainer.cpp: merging into latest changes [59e572b8fabc]

2013-01-23 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llspeakingindicatormanager.cpp: CHUI-678 (Voice indicators not shown for participants in torn off	conference conversations) [319155b5e85b]

2013-01-18 mberezhnoy  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: merge! [f1b9b1852984]

* indra/newview/llfloaterimcontainer.cpp: CHUI-661 User cannot select multiple p2p conversation names in list to start conference chat [ed8a5bdeb68c]

2013-01-23 Merov Linden  <merov@lindenlab.com>

* Pull merge with lindenlab/viewer-chui [f7d915c47146]

* indra/newview/llspeakers.cpp, indra/newview/llspeakers.h:	CHUI-480 : Fixed : Flagged when local update is made and prevent doing it multiple times, allow group to graw by 1 (me) then the rest (prevent having group remaining hidden). [4dde24b51720]

* indra/newview/llspeakers.cpp: CHUI-480 : Fixed : Fetch group membership when starting group chat and populate speakers list [0136eb135ef2]

2013-01-23 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llinventoryfunctions.cpp: CHUI-687: post code review changes. Now upon deletion of an item, DND mode must be enabled in order to remove a notification from the DND history. [40784764d395]

* indra/newview/llfloaterimcontainer.cpp: merging [ba47161b5784]

* indra/llui/llfolderview.cpp, indra/llui/llfolderview.h,	indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/lldonotdisturbnotificationstorage.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/llimview.cpp, indra/newview/llinventoryfunctions.cpp, indra/newview/llinventoryfunctions.h:	CHUI-687: Problem: User sees inventory offer notifications for deleted items when logging in from do not disturb mode. Resolution: If an item that is deletes has a DND notification saved, then remove that notification so that it doesn't appear onec the user exists DND mode. [0b227a26a819]

2013-01-23 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterconversationpreview.cpp: CHUI-424 FIXED Args for appendMessage are added to respect Compact/Expanded mode [3efe8c3e640c]

2013-01-21 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h:	CHUI-655, CHUI-648 ADD FIX Conversation is not opened while first click on message from object; "Nearby Chat" dialog does not open while first attempt when pressing Ctrl+H keyboard shortcut : Fixed forced change visibility. [ca87da0a70b0]

2013-01-22 maxim  <maxim@mnikolenko>

* indra/newview/llviewerwindow.cpp: CHUI-692 FIXED Arrow keys will move avatar while IM container, nearby chat or IM session floater is in focus. [1d16b2f74cbb]

2013-01-21 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml, indra/newview/skins/default/xui/en/menu_participant_view.xml: CHUI-567 FIXED Menu items are moved to Participant view menu [bed5af394098]

2013-01-20 Merov Linden  <merov@lindenlab.com>

* indra/llui/llmenugl.cpp: CHUI-379 : Fix Mac and Linux build failures [459d3e1db665]

2013-01-18 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llui/llmenugl.cpp, indra/llui/llmenugl.h,	indra/newview/llviewermenu.cpp, indra/newview/llvoicevivox.cpp, indra/newview/llvoicevivox.h,	indra/newview/skins/default/xui/en/floater_voice_effect.xml, indra/newview/skins/default/xui/en/menu_viewer.xml: CHUI-379 FIXED Restore Voice Morphing menu [9e3bbb00770d]

2013-01-18 Cho  <cho@lindenlab.com>

* merging latest changes [55448f8950b3]

* indra/newview/llviewermessage.cpp: merging latest changes [5baa3ad43735]

* indra/newview/llviewermessage.cpp: CHUI-688 FIX Viewer crash when blocked user sends friend request Added a check for notification_ptr being null in	friendship_offer_callback [7e450512b225]

2013-01-17 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llconversationview.cpp: CHUI-625 Participant drop down icon not visible when conversation is	highlighted orange: redraw the arrow slightly later [6151a425af5e]

2013-01-18 maxim  <maxim@mnikolenko>

* Merge [958e0610ca84]

* indra/newview/llconversationview.cpp: CHUI-681 FIXED Clear flash state only for selected widget [757c40b8e388]

2013-01-17 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-631 (Next conversation in list should be selected in	Conversations floater after closing a conversation) Don't force selecting nearby chat after closing conversation [fd2c24e71f10]

2013-01-17 Merov Linden  <merov@lindenlab.com>

* Pull from lindenlab/viewer-chui [3e03c0e708cd]

* indra/llui/llmenugl.cpp, indra/newview/llpaneloutfitedit.cpp: CHUI-682 : Fixed : Added LLMenuGL as a possible child of a toggle or contextual menu (for dynamic submenus). [36be25489b86]

2013-01-16 Merov Linden  <merov@lindenlab.com>

* indra/newview/llpaneloutfitedit.cpp: CHUI-682 : WIP : Instrument the menu display (or lack thereof). [5360c7379b4c]

2013-01-17 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llviewermessage.cpp: CHUI-604: Problem: DND response was inside of the responder for the inventory offer. Resolution: DND response is now sent upon receiving an offer notification from an agent. [02887ff2f212]

* indra/newview/llnotificationstorage.cpp: CHUI-680: Adjusted LLResponderRegistry to be derived from LLRegistrySingleton instead of LLResponderRegistry making its over version. [7074299af11d]

* indra/newview/lldonotdisturbnotificationstorage.cpp: CHUI-685 removing some commented out code [06211e7a4b9e]

* merging [2c2db1af6e96]

* indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/lldonotdisturbnotificationstorage.h,	indra/newview/llfloaterimcontainer.cpp: CHUI-685 Problem: The notifications .xml file was cleared upon exit because removeIMNotification was being called and deleting inventory offers becaus they did not have a session id. Resolution: Now check to make sure that removeIMNotification only removes IMs (IMToast). [b5c089cfb31f]

2013-01-17 Cho  <cho@lindenlab.com>

* merging latest changes [e945f25f6bb0]

* merging latest changes [0db876bf55f2]

* indra/newview/lltoastnotifypanel.cpp: CHUI-292 FIX Extra space in object chiclet toasts in CHUI viewer compared with release viewer In LLToastNotifyPanel, moved mInfoPanel->SetFollowsAll immediately before call to	snapToMessageHeight as was previously the case in release viewer [5cb023d2813f]

2013-01-16 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-618 ADD FIX User sees no indication of offline messages received with conversation log preference turned off: forced flashing of conversation's item when offline message is present [bd7bc6f8152a]

2013-01-17 maxim  <maxim@mnikolenko>

* Merge [3da8c7b57952]

2013-01-16 maxim  <maxim@mnikolenko>

* indra/llui/llfloater.cpp: CHUI-650 (Floaters not returning to active transparency after	becoming inactive) - Checking is added(comparing to previous fix) to avoid crash. [2e369c4000d1]

2013-01-16 Merov Linden  <merov@lindenlab.com>

* Pull from lindenlab/viewer-chui [0dd2aecff8a3]

* indra/newview/app_settings/settings.xml, indra/newview/llpanelblockedlist.cpp: CHUI-683 : Default sort order for Blocked was wrong, unrecognized value was not tested. [84872cce201c]

2013-01-15 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: merging changes [307376fd5af3]

* indra/newview/llagent.cpp, indra/newview/llcommunicationchannel.cpp, indra/newview/llcommunicationchannel.h,	indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/lldonotdisturbnotificationstorage.h:	CHUI-668: Code review changes [27d772b8b575]

* indra/newview/llfloaterimcontainer.cpp: merging in latest changes [981751162036]

2013-01-14 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llimview.cpp: CHUI-668: The user's most intrusive notification is not used anymore when coming out of DND mode with IMs. Adjusted code to just open the converseation floater (which was changed also in a prior fix by PE). [ca8ba199b22f]

* indra/mac_crash_logger/CrashReporter.nib/classes.nib, indra/mac_crash_logger/CrashReporter.nib/info.nib, indra/mac_crash_logger/CrashReporter.nib/objects.xib, indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h, indra/newview/llimview.cpp, indra/newview/llpanelpathfindingrebakenavmesh.cpp, indra/newview/llpanelpathfindingrebakenavmesh.h,	indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml: merging latest changes [233e164337b4]

2013-01-11 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterpreference.cpp, indra/newview/llimview.cpp: CHUI-668: Now when exiting DND mode, the user's most intrusive notification will be used to notify that user (if received IM's	during DND mode). Nearby chat messages/settings are ignored. [2f2fa8ad450b]

* indra/newview/llcommunicationchannel.cpp, indra/newview/llcommunicationchannel.h,	indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/lldonotdisturbnotificationstorage.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h, indra/newview/llimview.cpp: CHUI-668: Not fully complete but as of this commit, have functionality to use the user's most intrusive chat notification upon exiting from DND mode with IM's. Also if in DND mode, clicking on a conversation line item or floater, will flush the DND notifications system of storing that conversation. This way upon existing DND mode already responded conversations won't be notified to the user. [dec1707d108b]

2013-01-16 Cho  <cho@lindenlab.com>

* merging latest changes [c389b7bee27d]

2013-01-15 Cho  <cho@lindenlab.com>

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h:	CHUI-679 FIX Crash when script floater appears in CHUI viewer LLPostponedNotification now inherits from LLMortician so it can postpone its deletion. This prevents a crash when looking up an avatar name in the case where the name already exists in the cache. [d42b6fb88a79]

2013-01-14 Cho  <cho@lindenlab.com>

* indra/mac_crash_logger/CrashReporter.nib/classes.nib, indra/mac_crash_logger/CrashReporter.nib/info.nib, indra/mac_crash_logger/CrashReporter.nib/objects.xib, indra/newview/llpanelpathfindingrebakenavmesh.cpp, indra/newview/llpanelpathfindingrebakenavmesh.h,	indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml: merging latest changes? [4cc39de5a099]

* indra/llaudio/lllistener.cpp: reverted test commit [a8c218965af9]

2013-01-11 Cho  <cho@lindenlab.com>

* indra/llaudio/lllistener.cpp: test commit [d07d3cd6a7b3]

2013-01-15 Merov Linden  <merov@lindenlab.com>

* Merge with lindenlab/viewer-chui [6dee95bb1abd]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsession.h:	CHUI-458 : Fixed : Tidy up the title overwrite by the selected conversation [a4ddd44059ce]

2013-01-14 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsession.h:	CHUI-458 : WIP : Allow change of the general conversations panel when the selected conversation needs it (e.g. P2P is typing) [28817b2540d3]

2013-01-15 maxim  <maxim@mnikolenko>

* indra/newview/app_settings/settings_per_account.xml, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/llfloatertranslationsettings.cpp, indra/newview/llfloatertranslationsettings.h,	indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml: CHUI-567 FIXED "Translate chat", "Translation settings..." menu items are added. [6b2184d7ecac]

2013-01-14 maximbproductengine  <maximbproductengine@lindenlab.com>

* indra/mac_crash_logger/CrashReporter.nib/classes.nib, indra/mac_crash_logger/CrashReporter.nib/info.nib, indra/mac_crash_logger/CrashReporter.nib/objects.xib, indra/newview/llpanelpathfindingrebakenavmesh.cpp, indra/newview/llpanelpathfindingrebakenavmesh.h,	indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml: merge [e2fc63b9678b]

* indra/newview/llfloaterimcontainer.cpp: CHUI-662 (Multi select across conversations can result in (???)	(???) in the conversation list) [120d128d3bd6]

2013-01-12 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-618 ADD FIX User sees no indication of offline messages received with conversation log preference turned off: changed in accordance with a new requirements (open conv. floater instead	flashing) [3d57a2280b12]

2013-01-11 Merov Linden  <merov@lindenlab.com>

* Merge 3.4.4 tag [d09ac115e65c]

* Pull from viewer-chui [53461b51b816]

* pull from richard/viewer-chui [600c5464fc1f]

* indra/llui/llfloater.cpp: CHUI-650 : Revert : revert the change as it creates infinite recursive calls [bb0565e3a408]

2013-01-11 maxim  <maxim@mnikolenko>

* indra/llui/llfloater.cpp: CHUI-650 FIXED Set focus to floater when bringToFront is called(even if it's already in front). [7c284b251b69]

2013-01-10 Merov Linden  <merov@lindenlab.com>

* indra/llui/llmultifloater.cpp: CHUI-672 : Fixed : LLMultiFloater members need to be initialized in constructor. [542166e65c4a]

2013-01-11 Merov Linden  <merov@lindenlab.com>

* .hgtags, indra/llui/llnotificationslistener.cpp, indra/llui/llnotificationslistener.h,	indra/newview/llcallfloater.cpp, indra/newview/llcallfloater.h,	indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfoldervieweventlistener.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h,	indra/newview/llnearbychatbar.cpp, indra/newview/llnearbychatbar.h,	indra/newview/llnearbychatbarlistener.cpp, indra/newview/llnearbychatbarlistener.h,	indra/newview/llnearbychathandler.cpp, indra/newview/llnearbychathandler.h,	indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llpanelmarketplaceoutboxinventory.h,	indra/newview/skins/default/textures/bottomtray/Unread_IM.png, indra /newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png, i	ndra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.pn	g, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dar k.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_ Dark.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_O n_Dark.png, indra/newview/skins/default/xui/da/menu_im_well_button.xml, indra/newview/skins/default/xui/de/menu_im_well_button.xml, indra/newview/skins/default/xui/en/floater_chat_bar.xml, indra/newview/skins/default/xui/en/floater_voice_controls.xml, indra/newview/skins/default/xui/en/menu_im_well_button.xml, indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml, indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml, indra /newview/skins/default/xui/en/menu_people_friends_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml, indra/newview/skins/default/xui/en/panel_activeim_row.xml, indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml, indra/newview/skins/default/xui/en/panel_group_control_panel.xml, indra/newview/skins/default/xui/en/panel_im_control_panel.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml, indra /newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml, indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xm	l, indra/newview/skins/default/xui/es/menu_im_well_button.xml, indra/newview/skins/default/xui/fr/menu_im_well_button.xml, indra/newview/skins/default/xui/it/menu_im_well_button.xml, indra/newview/skins/default/xui/ja/menu_im_well_button.xml, indra/newview/skins/default/xui/pl/menu_im_well_button.xml, indra/newview/skins/default/xui/pt/menu_im_well_button.xml, indra/newview/skins/default/xui/ru/menu_im_well_button.xml, indra/newview/skins/default/xui/tr/menu_im_well_button.xml, indra/newview/skins/default/xui/zh/menu_im_well_button.xml: Pull merge from viewer-chui [0884e68ecf03]

2013-01-10 Merov Linden  <merov@lindenlab.com>

* .hgtags, BuildParams, indra/llcommon/CMakeLists.txt, indra/llmessage/llavatarnamecache.cpp, indra/llplugin/slplugin/CMakeLists.txt, indra/llvfs/CMakeLists.txt, indra/mac_crash_logger/CMakeLists.txt, indra/mac_crash_logger/CrashReporter.nib/classes.nib, indra/mac_crash_logger/CrashReporter.nib/info.nib, indra/mac_crash_logger/CrashReporter.nib/objects.xib, indra/mac_updater/CMakeLists.txt, indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llagent.cpp, indra/newview/llappviewer.cpp, indra/newview/llflexibleobject.cpp, indra/newview/llpanelpathfindingrebakenavmesh.cpp, indra/newview/llpanelpathfindingrebakenavmesh.h,	indra/newview/llviewermenu.cpp, indra/newview/llviewerobject.cpp, indra/newview/llviewerwindow.cpp, indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/en/menu_viewer.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml, indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml: Merge pull from lindenlab/viewer-beta [effaa643388a]

* indra/llui/llfolderviewitem.cpp: Pull merge from richard/viewer-chui [489ec258a19f]

* indra/newview/llinventorypanel.cpp, indra/newview/llpanelobjectinventory.cpp: CHUI-649 : Fixed : Added the contextual menu to in build content tab [dffd0c575280]

2013-01-09 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/newview/llinventorybridge.cpp: CHUI-649 : WIP : Cleanup code to make it readable [0297dd4bd2e2]

2013-01-10 maximbproductengine  <maximbproductengine@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: merge [644e9b0a20fc]

* indra/newview/llfloaterimcontainer.cpp: CHUI-663 (Right click menus on participants inactive in conversation	floater for torn off conversation) [bfac0e9211b9]

2013-01-08 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llfloaterimcontainer.cpp: CHUI-612 FIXED Blank conversation names showing in conversation list [5a93c6cd2274]

2013-01-10 maxim  <maxim@mnikolenko>

* indra/llui/llfolderviewitem.cpp: CHUI-658 FIXED Don't highlight whole content of the folder after right clicking if it is flashing. [b91b9b2a8052]

2013-01-09 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [4ef04abce5e5]

* indra/llui/llfolderviewitem.cpp: CHUI-652 : Fixed : Maintain multi selection consistent when click and drag an already selected item (drag multi select was broken) [cb3d95413b4d]

* indra/newview/llviewerobject.cpp: CHUI-652 : Fixed : Skip the bogus fetching test when adding objects to object content. [43f3655f2ae4]

2013-01-09 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimview.cpp: CHUI-670: Prevent flashing of 'Chat' FUI button while in DND mode and receive IM. [7c576c0db57d]

* indra/newview/llimview.cpp: CHUI-669: Upon DND mode exit, no longer flash IM messages that were stored during DND mode. [ae6758e40a9e]

2013-01-09 maxim  <maxim@mnikolenko>

* indra/newview/llimview.cpp: CHUI-638 FIXED Don't force button and widget to flash if the object is muted. [726c2b08787f]

2013-01-08 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-611 Fixed! Text in torn off message panel not wrapping correctly with size of conversation panel [0200a255323e]

2013-01-09 maximbproductengine  <maximbproductengine@lindenlab.com>

* indra/newview/skins/default/xui/en/menu_participant_view.xml: CHUI-665 (Change "Open conversation log" to "Conversation log..." in	communication floater view/sort menu) [a4b08fd4db6a]

2013-01-08 Merov Linden  <merov@lindenlab.com>

* Merge pull from richard/viewer-chui [b6f7d718a6cb]

* indra/llui/llfolderview.cpp, indra/llui/llfolderview.h,	indra/llui/llfolderviewmodel.h, indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h:	CHUI-659 : Fixed : Reimplemented open selection on hitting return the right way [a3d35165173b]

2013-01-07 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp: CHUI-659 : WIP : Cleanup llfolderviewitem of filter code as it all moved into llfolderviewmodel. [6a1c4fb9d6ba]

* indra/llui/llfolderviewitem.cpp, indra/newview/llfolderviewmodelinventory.cpp: CHUI-659 : WIP : Clamp down on the number of rearrange we really need. [363ed362c842]

* indra/newview/llfolderviewmodelinventory.cpp: CHUI-659 : WIP : Clean up typos in my own comments [14da6e75b4ce]

* indra/newview/llfolderviewmodelinventory.cpp: CHUI-659 : WIP : Reimplemented favorite landmark sorting to follow favorites bar index sorting. [69616244fb3b]

* indra/llui/llfolderviewmodel.h, indra/newview/llinventoryfilter.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/lltexturectrl.cpp: CHUI-659 : WIP : Verified (tested) and cleaned up some CHUI-101 refactoring code. [a42f11618132]

2013-01-08 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/newview/lldonotdisturbnotificationstorage.cpp: CHUI-660: Post code review changes [1853edf14d82]

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/newview/lltoastnotifypanel.cpp: CHUI-660: Problem: Upon auto-existing DND mode upon startup, the notification form elements (buttonts) were added to the form. But then deserialized form elements were also being added to the form causing duplicate buttons. As a solution, only add on the deserialized form elements that exceed the amount in the template. [210f5787e742]

2013-01-08 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp: CHUI-602 FIXED Return false if Selected view model item is null. [ea39b27ae3d1]

2013-01-05 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-643 FIXED Collapsed conversations floater has huge right padding: clean up; remove debug code [c2f60137b032]

2013-01-04 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llmultifloater.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h:	CHUI-643 FIXED Collapsed conversations floater has huge right padding: prevent of a rewriting mOriginMinWidth and mOriginMinHeight to default values [7aa9c549e5d8]

2013-01-05 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-643 W.I.P. Collapsed conversations floater has huge right padding: corrected of a imcontainer's resize calculating [3d5d5540baf4]

2013-01-04 Merov Linden  <merov@lindenlab.com>

* indra/llui/llnotifications.cpp, indra/newview/llimview.cpp, indra/newview/llviewermessage.cpp: Merge with viewer-chui [277e0c954369]

* indra/llui/llnotifications.cpp, indra/llui/llnotificationslistener.cpp, indra/llui/llnotificationslistener.h,	indra/newview/llconversationlog.cpp, indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/llimview.cpp, indra/newview/llviewermessage.cpp, indra/newview/llvoavatar.cpp: Merge with viewer-chui [7ce1f62cefdd]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterpreference.cpp: CHUI-580 : Fixed : Avoid fetching names while reacting to display name checkbox change (overkill), make display name pref disabled when usePeopleAPI is off [3e26ea838a20]

2012-12-17 Merov Linden  <merov@lindenlab.com>

* indra/llui/llnotifications.cpp, indra/llui/llurlentry.cpp, indra/newview/llavatariconctrl.cpp, indra/newview/llavatarlistitem.cpp, indra/newview/llchathistory.cpp, indra/newview/llconversationlog.cpp, indra/newview/llconversationmodel.cpp, indra/newview/llfloaterinspect.cpp, indra/newview/llfloaterinspect.h,	indra/newview/llfloaterreporter.cpp, indra/newview/llfloatersellland.cpp, indra/newview/llfloatervoicevolume.cpp, indra/newview/llimview.cpp, indra/newview/llinspectavatar.cpp, indra/newview/llnamelistctrl.cpp, indra/newview/llpanelgroupgeneral.cpp, indra/newview/llpanelgroupinvite.cpp, indra/newview/llpanelgrouproles.cpp, indra/newview/llpanelplaceprofile.cpp, indra/newview/llpanelplaceprofile.h, indra/newview/llvoicevivox.cpp: CHUI-580 : WIP : Added disconnect of callbacks once they're called to prevent filling up the callback queue [7b3274639ee1]

* indra/llui/llscrolllistctrl.cpp, indra/llui/llurlentry.cpp, indra/newview/llavataractions.cpp, indra/newview/llavatarlistitem.cpp, indra/newview/llimview.h,	indra/newview/llpanelgroupgeneral.cpp, indra/newview/llpanelgroupgeneral.h,	indra/newview/llpanelgroupinvite.cpp, indra/newview/llpanelgrouproles.cpp, indra/newview/llpanelgrouproles.h, indra/newview/llvoicevivox.cpp: Merge with viewer-chui [90badc9d7a5b]

* indra/llui/llnotifications.cpp, indra/llui/llscrolllistctrl.cpp, indra/llui/llurlentry.cpp, indra/llui/llurlentry.h,	indra/newview/llavataractions.cpp, indra/newview/llavatariconctrl.cpp, indra/newview/llavatarlistitem.cpp, indra/newview/llcallingcard.cpp, indra/newview/llchathistory.cpp, indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llconversationmodel.cpp, indra/newview/llfloaterdisplayname.cpp, indra/newview/llfloaterinspect.cpp, indra/newview/llfloaterinspect.h,	indra/newview/llfloaterreporter.cpp, indra/newview/llfloaterreporter.h,	indra/newview/llfloatersellland.cpp, indra/newview/llfloatervoicevolume.cpp, indra/newview/llimview.cpp, indra/newview/llimview.h, indra/newview/llinspectavatar.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llnamelistctrl.cpp, indra/newview/llnamelistctrl.h,	indra/newview/llpanelgroupgeneral.cpp, indra/newview/llpanelgroupgeneral.h,	indra/newview/llpanelgroupinvite.cpp, indra/newview/llpanelgrouproles.cpp, indra/newview/llpanelgrouproles.h,	indra/newview/llpanelplaceprofile.cpp, indra/newview/llpanelplaceprofile.h,	indra/newview/llpathfindingobject.cpp, indra/newview/lltoolpie.cpp, indra/newview/llviewerdisplayname.cpp, indra/newview/llviewermessage.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoicevivox.cpp, indra/newview/llvoicevivox.h:	CHUI-580 : WIP : Protect callback connections passed to	LLAvatarNameCache::get where necessary [6b1cd77fa4a2]

2013-01-04 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimview.cpp: merging in latest changes [d7dfaea85b67]

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llimhandler.cpp, indra/newview/llimview.cpp: CHUI-499: Now when existing DND mode, stored IM's will not show a	toast but instead flash the conversation line item and Chat FUI button. [b147aa312527]

2013-01-03 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llnotificationstorage.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewermessage.h:	CHUI-499: Fixed a serialization problem where the a notification's	objectInfo was not being serialized/deserialized. [acd59eeea7aa]

2013-01-04 maximbproductengine  <maximbproductengine@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp: merge [6925a0b9d2ab]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp: CHUI-608 (Conversations floater can be resized too small once a	conversation is torn off) [d1a475e8395a]

2013-01-04 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp: CHUI-637 FIXED Call requestArrange to update widget state. [3a3dda156d42]

2013-01-03 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-656 : Fixed. getTypedInstance will create an instance if not found. Do not use that in destructors (bad...) or in places where creation is not required. Use findTypedInstance instead. [aaa5319d1028]

* indra/newview/llfloaterimcontainer.cpp: CHUI-654 : Fixed! Select the Nearby Chat directly when one conversation only left, don't finesse with a root UUID that might not be NULL [2deefb6af59d]

2013-01-03 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-628 FIXED Open conversation log menu option not active in	conversation floater when nearby chat is selected: Determination of	the availability menu item was moved to the right place [0d9c879303db]

* indra/newview/llfloaterimsessiontab.cpp: CHUI-631 FIXED 'Nearby chat' is not selected in Conversations floater after closing separate conversation if list of participants was expand in Conversations floater: force select 'Nearby chat' when session floater is destroyed [566f810cbfbc]

2013-01-03 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp: CHUI-636 FIXED Enable group context menu options, if uuid is empty and selected model item is group chat. In addition enable Chat history item for ad-hoc and group conversations. [42e2dd139a3f]

* Merge [833c678fb363]

2012-12-28 maxim  <maxim@mnikolenko>

* indra/newview/skins/default/xui/en/floater_conversation_log.xml: CHUI-639 FIXED Min. width is increased to avoid overlapping [4d41fa5a23c1]

2012-12-28 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-453 FIXED Tooltip on chevron in torn-off conversation is	incorrect: implemented suitable tool-tips; fixed a small separate bug ("tooltip_to_separate_window"/"tooltip_to_main_window" for Tear-	Off Button: was shown reverse) [c1f8ea939a72]

* indra/llui/llbutton.cpp, indra/newview/llimview.cpp: CHUI-566 ADD. FIX Flashing and color on Conversations FUI button and conversation line item Cancel sticking of color, if the button is	pressed, or when a flashing of the previously selected button is	ended [75056cd237da]

2013-01-03 maximbproductengine  <maximbproductengine@lindenlab.com>

* indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp: CHUI-608 (Conversations floater can be resized too small once a	conversation is torn off) [6695516205b9]

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h:	CHUI-616 (Left Click on participant name in torn off conference	moves focus to conversation floater) [55765d2871ff]

2013-01-02 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/lldonotdisturbnotificationstorage.cpp: CHUI-499: Removing debug code [0d36aa06f078]

* merging in latest changes [a71a3461e369]

2012-12-21 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes' [9daabe4debdf]

* merging in latest changes [9647ac451621]

2012-12-20 Gilbert Gonzales  <gilbert@lindenlab.com>

* mergining in latest changes [1b5d86ebd203]

2012-12-19 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [bf61dc2b38a2]

* indra/newview/app_settings/settings.xml: CHUI-607: Due to a problem in design we have two checkboxes that determine whether a conversation transcript should be saved. By	defaut commiting a change that makes both checkboxes checked by default. This makes it so that a new user can see their transcript/chat history. [e0b9616f3ebf]

2012-12-19 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/llnotificationstorage.cpp: CHUI-499: Code clean-up and adding some more types badly defined. [d949d68eb876]

* indra/newview/skins/default/xui/en/notifications.xml: Switching some notification types from "offer" to be "notify" as the notifications were not offers. [9ef172fea7cf]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui. [d8d8cda437d9]

* indra/newview/llagent.cpp, indra/newview/llchannelmanager.cpp, indra/newview/llcommunicationchannel.cpp, indra/newview/llcommunicationchannel.h,	indra/newview/lldonotdisturbnotificationstorage.cpp: CHUI-499: Loading the DND notifications upon exit from DND mode and after login. [c7008a7a2cac]

2012-12-18 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llnotificationstorage.cpp, indra/newview/llnotificationstorage.h,	indra/newview/llpersistentnotificationstorage.cpp: CHUI-499: Refactoring the LLPersistentNotificationStorage implementation for shared usage with the new LLDoNotDisturbNotificationStorage class. [8ffe2363a011]

2012-12-26 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llconversationlog.cpp: CHUI-629 FIXED Resolve build problems; [f3894c0313d5]

* indra/newview/llconversationlog.cpp: CHUI-629 FIXED Windows crash on exit when closing viewer with conversation log open with unread offline messages [362abb28e0a6]

2012-12-26 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsessiontab.cpp: CHUI-617 FIXED Update Gear button state after initing session. mConversationsRoot creation is moved to postBuild. [f633928a9e9f]

* indra/newview/llpanelblockedlist.cpp: CHUI-632 FIXED Disable Gear button if nothing is selected [dcbbf085a734]

2012-12-25 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-623 FIXED No vertical scrollbar in conversation list [e6052839dee3]

2012-12-24 maxim  <maxim@mnikolenko>

* indra/newview/skins/default/xui/en/floater_conversation_log.xml: CHUI-627 FIXED Unnecessary attributes are deleted in xml [262807732e0a]

* indra/newview/llviewermenu.cpp, indra/newview/skins/default/xui/en/menu_viewer.xml: CHUI-583 FIXED Link will be opened in external browser if this preference is set. [88350c2927c0]

2012-12-21 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llconversationlog.cpp: CHUI-411 Entries in chat history viewer do not show all dates of	entries and some entries show on multiple pages Type of variable for the time saving was changed from S32 to long int ("capacity" of	S32-timer is only ~18 hours!) [893ec4ac2441]

* indra/newview/llimview.cpp: CHUI-566 Flashing and color on Conversations FUI button and conversation line item: change behavior for the case "If	conversations (container) floater open but not on top" [5a4a9b2c70aa]

2012-12-21 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/skins/default/xui/en/floater_conversation_log.xml: CHUI-622 FIXED Default size of conversation log floater seems large [4971a10659ad]

* indra/newview/llchiclet.cpp, indra/newview/skins/default/textures/bottomtray/Notices_Unread.png: CHUI-621 FIXED Notification chiclet UI error [a604bca003da]

2012-12-21 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/app_settings/settings.xml, indra/newview/llimview.cpp: CHUI-619 FUI button and conversation line items blink at different rates: changed rate [86acc049319f]

2012-12-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llconversationlog.cpp: CHUI-605 : Fixed : Keep conversation log requires restart to change preference: connected LLConversationLog::enableLogging as listener to "LogInstantMessages" control changes [9d9473d9fcee]

2012-12-20 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [1ee5e7edf73b]

* indra/llui/llfolderview.cpp, indra/llui/llfolderview.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-429 : Fixed! Add a flag to filter multi/single selection situations in menu building. Implement in conversation contextual menu. [9bac69b33eb7]

2012-12-20 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/app_settings/settings_per_account.xml, indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-513 FIXED Revise initial conversation floater size [69d5f58072b9]

2012-12-20 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merge [3ab796872e87]

* indra/newview/llfloaterimsessiontab.cpp: CHUI-588 (Clicking nearby chat toast doesn't highlight proper	conversation line item) [e2b3edc29350]

2012-12-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-618 User sees no indication of offline messages received with conversation log preference turned off: flashing of CHUI button if	offline messages was received [9b68a4f9ee83]

2012-12-20 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp: CHUI-602 FIXED Don't call getUUID if there is no selected participants [434ec7620266]

2012-12-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/app_settings/settings.xml: CHUI-606 Default settings in CHUI viewer do not keep IM logs for users: Preferences > Chat > Keep a convers. log was turned on	[79bd5a1da563]

2012-12-19 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [5514f8c45ad2]

* indra/llui/llbutton.cpp: CHUI-600 : Fixed! Modified the button flash state so it sticks after the animation and is dismissed on toggle [567cfd25e694]

* indra/newview/llconversationview.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h, indra/newview/llimview.cpp, indra/newview/skins/default/colors.xml: CHUI-600 : Fix the orange (provided by Leo), fix the conversation item flashing (when shown) [6731d8ea866d]

* indra/newview/llconversationview.cpp, indra/newview/llimview.cpp, indra/newview/skins/default/colors.xml: Pull merge from richard/viewer-chui [ea59c546e1e7]

* indra/llui/llfolderviewitem.cpp, indra/llui/llnotificationslistener.cpp, indra/llui/llnotificationslistener.h,	indra/newview/skins/default/colors.xml: Pull merge from richard/viewer-chui [570799bbf82b]

2012-12-18 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/skins/default/colors.xml: CHUI-600 : WIP : Flash conversation item in different color than select and start flashing only when shown [798c2fcdf143]

2012-12-19 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llchiclet.cpp, indra/newview/llchiclet.h,	indra/newview/llchicletbar.cpp, indra/newview/llsyswellwindow.cpp, indra/newview/llsyswellwindow.h,	indra/newview/skins/default/textures/textures.xml, indra/newview/ski ns/default/xui/da/menu_notification_well_button.xml, indra/newview/s kins/default/xui/de/menu_notification_well_button.xml, indra/newview /skins/default/xui/en/menu_notification_well_button.xml, indra/newview/skins/default/xui/en/panel_chiclet_bar.xml, indra/newv iew/skins/default/xui/es/menu_notification_well_button.xml, indra/ne wview/skins/default/xui/fr/menu_notification_well_button.xml, indra/ newview/skins/default/xui/it/menu_notification_well_button.xml, indr a/newview/skins/default/xui/ja/menu_notification_well_button.xml, in	dra/newview/skins/default/xui/pl/menu_notification_well_button.xml, i	ndra/newview/skins/default/xui/pt/menu_notification_well_button.xml, indra/newview/skins/default/xui/ru/menu_notification_well_button.xml , indra/newview/skins/default/xui/tr/menu_notification_well_button.x	ml, indra/newview/skins/default/xui/zh/menu_notification_well_button .xml: CHUI-592 FIXED Unread notifications are not being saved in	notification chiclet [52b9d6ac8be5]

2012-12-18 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h:	Clean up: Removed unnecessary call removeConversationListItem when floater closes (If session's floater will be removed for any reason,	then will start a removing of the corresponding session and	removeConversationListItem will call from a session's observer); Local variable are renamed in accordance with the code styling [f165fc595e68]

2012-12-19 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llfolderviewitem.cpp: CHUI-601 : Fixed : Crash when dismissing a conversation while a	participant is selected DeletePointer for the items was replaced by Function LLFolderViewItem::destroyView: Function LLFolderViewItem::destroyView, before removing the item, immediately removes it from the Selection List of the Root Folder. As a result, at the time of the call of sanitizeSelection, will not need to try to handle the elements that have already been deleted. [ec3ecc268550]

2012-12-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llbutton.cpp, indra/newview/llimview.cpp, indra/newview/skins/default/colors.xml, indra/newview/skins/default/xui/en/widgets/toolbar.xml: CHUI-566 Flashing and color on Conversations FUI button and conversation line item [2e6f58e3da0b]

2012-12-18 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/skins/default/xui/en/notifications.xml: Removing copy from the DoNotDisturbModeSet notification as we are no longer auto deleting inventory offers. [d56ce80314e6]

* indra/newview/llimview.cpp: Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui. [0d7a73e181b6]

* indra/newview/llviewermessage.cpp: CHUI-569: Ensure that we create a friend request notification even in the case of do-not-disturb mode. The DND mode will log it to a	file to be re-created when DND mode is exited. [f38328ca4551]

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/newview/CMakeLists.txt, indra/newview/llchannelmanager.cpp, indra/newview/llcommunicationchannel.cpp, indra/newview/llcommunicationchannel.h,	indra/newview/lldonotdisturbnotificationstorage.cpp, indra/newview/lldonotdisturbnotificationstorage.h,	indra/newview/llimview.cpp, indra/newview/llnotificationhandler.h,	indra/newview/llviewerwindow.cpp: CHUI-499: Adding ability to serialize the communication notifications to local disk per user. [b68cd6b22fdc]

2012-12-17 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer- chui-stinson-alt. [db3c8207baaa]

* indra/newview/llimview.cpp: Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui. [900e8d8fcce6]

2012-12-14 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui. [ca6bc86c1278]

2012-12-13 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [9331db9488b8]

2012-12-12 William Todd Stinson  <stinson@lindenlab.com>

* indra/llui/llnotifications.h, indra/newview/CMakeLists.txt, indra/newview/llchannelmanager.cpp, indra/newview/llnotificationstorage.cpp, indra/newview/llnotificationstorage.h,	indra/newview/llpersistentnotificationstorage.cpp, indra/newview/llpersistentnotificationstorage.h:	CHUI-499: Refactoring the persistent notification storage so that I	can reuse the functionality for do-not-disturb mode. [e9bdfe5572a8]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [d168c65d4f8a]

* indra/newview/llviewerwindow.cpp: Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer- chui-stinson-merge. [87622a4a5249]

2012-12-11 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llimview.cpp: CHUI-494: Removing the creation of a new session while receiving an IM in DND mode. [2b4f2c474962]

* indra/newview/llchatbar.cpp: Removing cruft code. [0c4cb3a2090b]

* indra/newview/llviewerwindow.cpp: CHUI-494: Toggling the behavior of the communication notification channel filter as it should be true when not in DND mode and false when in DND mode. [6603e1dadd80]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [b4cc1d08c50a]

2012-12-10 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llnotificationhandler.h,	indra/newview/llviewerwindow.cpp, indra/newview/llviewerwindow.h: Correcting a mac build error. [29a3dfb172e7]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [7c725f807e5a]

2012-12-06 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llbrowsernotification.cpp, indra/newview/llfloateroutbox.cpp, indra/newview/llimhandler.cpp, indra/newview/llnotificationalerthandler.cpp, indra/newview/llnotificationgrouphandler.cpp, indra/newview/llnotificationhandler.h,	indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationhinthandler.cpp, indra/newview/llnotificationofferhandler.cpp, indra/newview/llnotificationscripthandler.cpp, indra/newview/llnotificationtiphandler.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llviewerwindow.h:	CHUI-494: WIP First pass at getting the suppression of events in DND working. [861b7818c7b9]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [1c6dc11eb756]

2012-12-05 William Todd Stinson  <stinson@lindenlab.com>

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h: Pull and merge ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. [570b07826bf8]

2012-12-04 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/skins/default/textures/bottomtray/Notices_Unread.png, i	ndra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.pn	g, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dar k.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3 _Dark.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_ Off_Dark.png, indra/newview/skins/default/textures/bottomtray/VoiceP TT_On_Dark.png, indra/newview/skins/default/xui/da/menu_im_well_button.xml, indra/ne wview/skins/default/xui/da/menu_notification_well_button.xml, indra/newview/skins/default/xui/de/menu_im_well_button.xml, indra/ne wview/skins/default/xui/de/menu_notification_well_button.xml, indra/ newview/skins/default/xui/en/menu_notification_well_button.xml, indra/newview/skins/default/xui/en/panel_activeim_row.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml, indra/newview/skins/default/xui/es/menu_im_well_button.xml, indra/ne wview/skins/default/xui/es/menu_notification_well_button.xml, indra/newview/skins/default/xui/fr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/fr/menu_notification_well_button.xml, indra/newview/skins/default/xui/it/menu_im_well_button.xml, indra/ne wview/skins/default/xui/it/menu_notification_well_button.xml, indra/newview/skins/default/xui/ja/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ja/menu_notification_well_button.xml, indra/newview/skins/default/xui/pl/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pl/menu_notification_well_button.xml, indra/newview/skins/default/xui/pt/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pt/menu_notification_well_button.xml, indra/newview/skins/default/xui/ru/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ru/menu_notification_well_button.xml, indra/newview/skins/default/xui/tr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/tr/menu_notification_well_button.xml, indra/newview/skins/default/xui/zh/menu_im_well_button.xml, indra/ne wview/skins/default/xui/zh/menu_notification_well_button.xml: Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [079df3502727]

2012-12-03 William Todd Stinson  <stinson@lindenlab.com>

* indra/llui/CMakeLists.txt, indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/llui/llnotificationslistener.cpp, indra/llui/llnotificationslistener.h,	indra/llui/llnotificationtemplate.h:	Cleaning up some unreferenced member variables and related types from LLNotifications. [1bc3e5c0318c]

2012-12-18 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [96f25b8134a8]

* indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsession.h, indra/newview/llimview.cpp: CHUI-385: Problem: When the new session was created with multiple participants the old conversation floater was being recycled. When the conversation floater was re-initialized it did not remove and update the chat messages. Resolution: When the conversation floater is recycled simply call reloadMessages. [672873069070]

2012-12-19 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-591 FIXED Issues with resizing conversations floater: small correction of size in right panel of conversation floater; [d8dbab503ef7]

2012-12-18 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-591 FIXED Issues with resizing conversations floater [6797d2db6381]

2012-12-18 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h:	merge [01501222f133]

* indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h:	CHUI-586 (Scroll bar only partially shown initially on torn off	conversations) [b6925bea0367]

2012-12-18 maxim  <maxim@mnikolenko>

* indra/newview/skins/default/xui/en/menu_viewer.xml: CHUI-583 FIXED Menu items with appropriate links are added [e1cb77dc5455]

* indra/newview/llfloaterimsessiontab.cpp: Additional fix for CHUI-562 [9ff93d9a3232]

* indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsession.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/menu_im_conversation.xml: CHUI-562 FIXED Gear button is added for p2p torn-off floater. [4e1a84fbdfcb]

2012-12-17 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llflexibleobject.cpp: Updating a comment. [03c5e4a45766]

* indra/newview/llagent.cpp: Removing some old code for parsing the response from changing maturity level as it is now consistent across the grid. [2f3c72bf26b0]

* indra/newview/llhudobject.cpp, indra/newview/llhudobject.h,	indra/newview/llvoavatar.cpp, indra/newview/llvoicevisualizer.cpp, indra/newview/llvoicevisualizer.h: CHUI-115: Removing code that is ifdef'ed out. [06d46fc24e04]

2012-12-17 maxim  <maxim@mnikolenko>

* indra/newview/llvoiceclient.cpp: CHUI-593 FIXED Using callback signal will update Speak button if	voice chat disabled [c50008023678]

2012-12-15 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-505 : Fixed : Don't open Call Log on login if the user doesn't	want a Call Log: Checked the setting status [05dcf1957eb4]

* indra/newview/llconversationlog.cpp, indra/newview/llfloaterconversationlog.cpp, indra/newview/llimview.cpp: CHUI-598 : Fixed : Conversation log file created even when keep conversation log preference is off : Checked the status of the another ("KeepConversationLogTranscripts") setting too. [31e8712569ab]

2012-12-15 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llui/lllayoutstack.cpp, indra/llui/lllayoutstack.h,	indra/llui/llmultifloater.cpp, indra/llui/llresizebar.cpp, indra/llui/llresizebar.h, indra/llui/llview.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimnearbychat.h,	indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-591 FIXED Issues with resizing conversations floater [c89d45cbf877]

2012-12-14 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llfloaterimcontainer.cpp: Pull merge from richard/viewer-chui [f3c47689c911]

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llfloaterimcontainer.cpp: CHUI-596 : Added a new flash state so we can keep a conversation highlighted after the flash time ends. Clears the flash state for all conversation on select. [64c3d8fc0298]

* indra/llmessage/llavatarnamecache.cpp, indra/llui/llscrolllistctrl.cpp, indra/llui/llurlentry.cpp, indra/newview/llfavoritesbar.cpp, indra/newview/llfriendcard.cpp, indra/newview/llpanelblockedlist.cpp, indra/newview/llpanelgroupinvite.cpp, indra/newview/llpanelgrouproles.cpp, indra/newview/llvoicevivox.cpp: CHUI-599 : Use the account name in all places that are not UI	related but use avatar names to index, search and other code only uses. [4d3b9d15fa0d]

2012-12-14 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [d22212d3e890]

* indra/newview/llfloaterimcontainer.cpp: CHUI-549: Updating the conversations floater according to specs. [c416d211c3f4]

2012-12-14 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp: mergiing in latest changes [269f2b2a1f31]

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsession.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/lloutputmonitorctrl.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-520: Now when have a P2P conversation torn off a voice indicator icon will be displayed allowing the user to adjust the voice volume when clicked. Also did a code cleanup on	conversationview.h/cpp which was showing the speaking indicator icon too soon when joining another voice session. This was due to calling switchIndicator(..) directly inside ::onCurrentVoiceSessionChanged. The proper solution is to wait for SpeeakingIndicatorManager::switchSpeakerIndicators call switchIndicators. [70a623def2fb]

2012-12-14 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/skins/default/xui/en/floater_people.xml: CHUI-554: Updating the people panel according to specs. [f2cf4531287c]

* indra/newview/skins/default/xui/en/floater_people.xml: CHUI-595: Updating the people panel according to specs. [8e5e6e57ed82]

* .hgtags, indra/llui/llscrolllistctrl.cpp, indra/newview/llvovolume.cpp: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [2c0974fbb42f]

2012-12-14 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp: merge [b0b6373178f0]

2012-12-12 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp: CHUI-589 (Conversation floater displays wrong IM floater when	receiving a new message) additional fix [88999324d531]

* indra/newview/llfloaterimcontainer.cpp: CHUI-589 (Conversation floater displays wrong IM floater when	receiving a new message) [055278931aa3]

2012-12-13 Merov Linden  <merov@lindenlab.com>

* indra/llcommon/llavatarname.h, indra/newview/llavataractions.cpp: CHUI-599 : Fixed : Avatar name provides now a method to get the regular account name. [1e3b9552d092]

* Pull merge from richard/viewer-chui [67eb1385e5c2]

* indra/llui/llfolderview.h, indra/newview/llinventoryfunctions.cpp: CHUI-574, CHUI-575 : Fixed inventory regressions : select the first filtered item when searching the inventory, simply made the folder selection secondary to item selection. [6c7e124c5cf6]

2012-12-13 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/skins/default/xui/en/floater_people.xml, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-595, CHU-554: Updating the people panel to new specs. [f273770b6958]

2012-12-13 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/lloutputmonitorctrl.h:	merging in latest changes [9ab72cc3ffc9]

2012-12-12 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/app_settings/settings.xml: CHUI-526: Slight bug fix. Problem was that the 'Teleport Offer' sound was turn on by default when the user cleared their settings. Resolution: Inside settings.xml changed the PlaySoundTeleportOffer to no longer have an intial value of 1 (true). Now it is 0 (false). [5f6608875f90]

* indra/newview/lloutputmonitorctrl.cpp: CHUI-545: Minor logic fix, inside ::switchIndicator, make sure that in the case that the parent is visible and the parent makes the visibility changes...that mIndicatorToggled becomes false because the parent has already made the visiblity changes. [290c5d52dc08]

* merging in latest changes [bfcb857078ca]

* indra/newview/llavatarlistitem.cpp, indra/newview/llavatarlistitem.h,	indra/newview/lloutputmonitorctrl.cpp, indra/newview/lloutputmonitorctrl.h:	CHUI-545: Adjusted fix because the old implementation of	::switchIndicator was not very clean and relied on the visiblity of	the OutputMonitorCtrl to have a visibility of true even when it wasn't. The fix implemented makes it so that the visibility of	OutputMonitorCtrl is always correct and the parent of this ctrl can use this information to adjust children adjacent to OutputMonitorCtrl. [4e412d537e14]

* mergining in latest changes [f4baf9b47c8e]

2012-12-11 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [c35cdc6feb73]

* indra/newview/lloutputmonitorctrl.cpp: CHUI-545: Problem: Sometimes the speaker indicator icons were not visible in the conversations panel. Resolution: The problem was that the visibility was set incorrectly. When the speaking indicator was not in the visible chain the state of the visiblity would be stored in a pending variable. If the visiblity changed before the pending variable was used, then this meant the pending variable overrode the most recent visibiltiy changes. So as a solution, if the visiblity changes then prevent the pending visiblity from being used. [e5371fedaf6d]

2012-12-13 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llavatariconctrl.h,	indra/newview/llconversationmodel.h,	indra/newview/llconversationview.h,	indra/newview/llfloaterimcontainer.h, indra/newview/llimview.h,	indra/newview/lloutputmonitorctrl.h, indra/newview/llviewermenu.h:	Fixed path for correct assembly of the project [e732d5a5642a]

2012-12-12 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer- chui-stinson-merge. [c70be62f7981]

* .hgtags, indra/newview/app_settings/settings.xml, indra/newview/llfloaterpreference.cpp, indra/newview/llpanelgrouproles.cpp, indra/newview/llviewerwindow.cpp, indra/newview/pipeline.cpp, indra/newview/pipeline.h: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. [b9c397929deb]

2012-12-12 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-584 : Addit. fix : Viewer crash when clicking on view/sort options drop down in conversation floater: Cancelled unconditional receiving a instance of the floater (LLFloaterReg::getInstance) from LLFloaterIMContainer::selectConversationPair, because in some situations this method is called from LLFloaterIMNearbyChat::postBuild - In other words, while the unfinished process of creation of this floater [1b97120dbd98]

* indra/newview/llfloaterimcontainer.cpp: CHUI-584 : Fixed : Viewer crash when clicking on view/sort options drop down in conversation floater: Protection from a lack of the current selection. It need for the newly created floater, which still is not finished adding the first conversation item. [f4db2a3f1e41]

* indra/newview/llfloaterimcontainer.cpp: CHUI-584 : WIP : Viewer crash when clicking on view/sort options drop down in conversation floater: Renaming of local vfriables in	accordance with the code convention [e7b50ce1b55a]

2012-12-12 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llvoiceclient.cpp, indra/newview/llvoiceclient.h: CHUI-427 FIXED Added callback to track changing in mUserPTTState. It's needed to synchronize both buttons [830ab57ff20f]

2012-12-12 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merge [1a8e683aad6d]

* indra/newview/llconversationview.cpp: CHUI-557 (Cannot expand conversation from minimized state by	clicking on selected conversation) [df8509011b1d]

2012-12-11 maxim  <maxim@mnikolenko>

* indra/newview/skins/default/xui/en/floater_camera.xml, indra/newview/skins/default/xui/en/floater_destinations.xml, indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/floater_moveview.xml: CHUI-572 FIXED Changed initial position for floaters according to screenshot. [d718292bdcac]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llviewermenu.cpp, indra/newview/skins/default/xui/en/menu_viewer.xml: CHUI-587 FIXED Disable menu item if "KeepConversationLogTranscripts" is false. [408c81f9f87b]

2012-12-10 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: merge [c2a12d94bc1b]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-394 (Group moderation tools missing in right click menus) [5a59b121ee31]

2012-12-10 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp: CHUI-457 FIXED Brought back the checking [5b6504981d73]

2012-12-07 Merov Linden  <merov@lindenlab.com>

* indra/newview/llpanelmarketplaceinboxinventory.cpp, indra/newview/llpanelobjectinventory.cpp: CHUI-509, CHUI-585 : Fixed : Add font color parameters to received items and other inventory elements created [b6d13fa5c47f]

* indra/newview/llimview.cpp: Pull merge from richard/viewer-chui [12203f997ee9]

* indra/llmessage/llavatarnamecache.cpp, indra/newview/llconversationmodel.cpp: CHUI-580, CHUI-406 : Fixed : Finished avatar name caching, also fixed the display of (waiting) when names don't come (mostly in	legacy mode). [77fbe3c76f70]

* indra/llcommon/llavatarname.cpp, indra/llcommon/llavatarname.h,	indra/llmessage/llavatarnamecache.cpp, indra/llmessage/llavatarnamecache.h, indra/llmessage/llcachename.h,	indra/llui/tests/llurlentry_stub.cpp, indra/newview/app_settings/settings.xml, indra/newview/llstartup.cpp, indra/newview/llviewermenu.cpp: CHUI-580 : Fixed : Clean up the use of display name. Allow the use of the legacy protocol in settings.xml [d352dc3ec907]

2012-12-05 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llimview.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llviewermessage.cpp, indra/newview/skins/default/textures/bottomtray/Notices_Unread.png, i	ndra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.pn	g, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dar k.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3 _Dark.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_ Off_Dark.png, indra/newview/skins/default/textures/bottomtray/VoiceP TT_On_Dark.png, indra/newview/skins/default/xui/da/menu_im_well_button.xml, indra/ne wview/skins/default/xui/da/menu_notification_well_button.xml, indra/newview/skins/default/xui/de/menu_im_well_button.xml, indra/ne wview/skins/default/xui/de/menu_notification_well_button.xml, indra/ newview/skins/default/xui/en/menu_notification_well_button.xml, indra/newview/skins/default/xui/en/panel_activeim_row.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml, indra/newview/skins/default/xui/es/menu_im_well_button.xml, indra/ne wview/skins/default/xui/es/menu_notification_well_button.xml, indra/newview/skins/default/xui/fr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/fr/menu_notification_well_button.xml, indra/newview/skins/default/xui/it/menu_im_well_button.xml, indra/ne wview/skins/default/xui/it/menu_notification_well_button.xml, indra/newview/skins/default/xui/ja/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ja/menu_notification_well_button.xml, indra/newview/skins/default/xui/pl/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pl/menu_notification_well_button.xml, indra/newview/skins/default/xui/pt/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pt/menu_notification_well_button.xml, indra/newview/skins/default/xui/ru/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ru/menu_notification_well_button.xml, indra/newview/skins/default/xui/tr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/tr/menu_notification_well_button.xml, indra/newview/skins/default/xui/zh/menu_im_well_button.xml, indra/ne wview/skins/default/xui/zh/menu_notification_well_button.xml: Pull merge from dev repo [d980099d1f4f]

* indra/llcommon/llavatarname.cpp, indra/llcommon/llavatarname.h,	indra/llmessage/llavatarnamecache.cpp, indra/llmessage/llavatarnamecache.h,	indra/llmessage/llcachename.cpp, indra/llui/llscrolllistctrl.cpp, indra/llui/llurlentry.cpp, indra/newview/llavataractions.cpp, indra/newview/llavatariconctrl.cpp, indra/newview/llavatarlist.cpp, indra/newview/llavatarlistitem.cpp, indra/newview/llcallingcard.cpp, indra/newview/llchathistory.cpp, indra/newview/llconversationmodel.cpp, indra/newview/llfavoritesbar.cpp, indra/newview/llfloateravatarpicker.cpp, indra/newview/llfloaterdisplayname.cpp, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterscriptlimits.cpp, indra/newview/llfloatersellland.cpp, indra/newview/llfloatertopobjects.cpp, indra/newview/llfloatervoicevolume.cpp, indra/newview/llfriendcard.cpp, indra/newview/llimview.cpp, indra/newview/llinspectavatar.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llnamelistctrl.cpp, indra/newview/llpanelblockedlist.cpp, indra/newview/llpanelgroupinvite.cpp, indra/newview/llpanelgroupnotices.cpp, indra/newview/llpanelgrouproles.cpp, indra/newview/llparticipantlist.cpp, indra/newview/lltoastgroupnotifypanel.cpp, indra/newview/lltoolpie.cpp, indra/newview/llviewerdisplayname.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermessage.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoicevivox.cpp: CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up. [14361194f863]

2012-12-07 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationview.cpp: CHUI-417: Problem: Speaking indicator icons were out of position because they were not taking into account the reduced width when a	vertical scrollbar appeared. Resolution: Now when the ::arrange function is called, this implies that the width of a conversation line item has changed...so within this function call updateChildren. updateChildren will reposition the speaker icon and info button based upon the adjusted width. [2ef9266afb3f]

* indra/newview/llimview.cpp: CHUI-579: Found a small bug in my last commit causing nearby chat im's to show two toast messages. Now the upper right toast (im	toasts) will only show when the session id is non NULL (Nearby chat	has a session value that is NULL). [32f572021f69]

* merging in latest changes [d9a87b3ba239]

* indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llimview.cpp: CHUI-579: Post code review. Renamed variables to make easier to read. [a86fcc805441]

* indra/newview/llimview.cpp: merging in latest changes [eca2845c290d]

2012-12-06 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [31eb2892755e]

* indra/newview/llimview.cpp: CHUI-579: When the 'Pop up message' preference is set the conversation line item and/or FUI button flash depending on what is focused. Also when the 'Flash the toolbar button' preference is set the FUI button will flash or the line item will flash depending upon what is focused. [8ad0dbc896b2]

2012-12-07 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-512 FIXED New incoming conversations take focus in message panel only and do not show toasts [edb265e5300f]

2012-12-07 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-547 : Fixed : (Clicking IM toast does not select message panel	in conversation floater) : select new session floater when a	container is hidden [a503cbd2d385]

* indra/newview/llfloaterimsessiontab.cpp: CHUI-564 : Fixed : (Conversation floater always opens when new IM is	received) : Remove obsolete code: control of an visibility of	container was delegated to on_new_message [see llimview.cpp] [407cf8f5d610]

2012-12-07 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp: CHUI-530 FIXED Changed selectConversation to	reSelectConversation [e901e6b11193]

2012-12-07 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-582 : fixed : Resizing conversation floater initially only resizes conversation list width. [15b05638a2b9]

2012-12-07 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-427 FIXED Voice button is added to Conversations floater. [0128abb2a510]

2012-12-06 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-505 FIXED Open Call Log if user has new events while out: force open Conversation Log Floater when received a saved offline message [1d804008e9a2]

2012-12-06 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp: merge [2314bec783b2]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h:	CHUI-576 (Group moderation menus do not work in torn off dialogs) [c266c65ade26]

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h:	CHUI-444 (Click target off when conversation list is minimized to	icons) [e5cf92348d67]

2012-12-05 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [969bef6de2e0]

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h:	CHUI-509 : Fixed : Add params to inventory widgets to control font colors (required for library items and links). [74fbf24601c4]

2012-12-05 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/lltabcontainer.cpp, indra/llui/lltabcontainer.h,	indra/newview/llfloaterimcontainer.cpp: CHUI 571: Code review changes, now LLFloaterIMContainer::showStub inlines code for hiding all tab panels and then showing the stub panel. Before the function would call hideAllTabs [e4d93d19165a]

2012-12-05 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/newview/llnotificationofferhandler.cpp, indra/newview/llviewermessage.cpp, indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-519 FIXED Do not put offered items into the trash while in Busy / DND mode [48d4f5bc0366]

2012-12-05 maxim  <maxim@mnikolenko>

* indra/newview/llconversationmodel.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-577 FIXED "Mute text" and "Block voice" items are added to	context menu instead of "Block\unblock" [58b477dc9255]

2012-12-05 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp: merging in latest changes [2c7e93e7c1d8]

2012-12-04 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimsession.cpp, indra/newview/skins/default/textures/bottomtray/Notices_Unread.png, i	ndra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.pn	g, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dar k.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3 _Dark.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_ Off_Dark.png, indra/newview/skins/default/textures/bottomtray/VoiceP TT_On_Dark.png, indra/newview/skins/default/xui/da/menu_im_well_button.xml, indra/ne wview/skins/default/xui/da/menu_notification_well_button.xml, indra/newview/skins/default/xui/de/menu_im_well_button.xml, indra/ne wview/skins/default/xui/de/menu_notification_well_button.xml, indra/ newview/skins/default/xui/en/menu_notification_well_button.xml, indra/newview/skins/default/xui/en/panel_activeim_row.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml, indra/newview/skins/default/xui/es/menu_im_well_button.xml, indra/ne wview/skins/default/xui/es/menu_notification_well_button.xml, indra/newview/skins/default/xui/fr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/fr/menu_notification_well_button.xml, indra/newview/skins/default/xui/it/menu_im_well_button.xml, indra/ne wview/skins/default/xui/it/menu_notification_well_button.xml, indra/newview/skins/default/xui/ja/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ja/menu_notification_well_button.xml, indra/newview/skins/default/xui/pl/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pl/menu_notification_well_button.xml, indra/newview/skins/default/xui/pt/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pt/menu_notification_well_button.xml, indra/newview/skins/default/xui/ru/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ru/menu_notification_well_button.xml, indra/newview/skins/default/xui/tr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/tr/menu_notification_well_button.xml, indra/newview/skins/default/xui/zh/menu_im_well_button.xml, indra/ne wview/skins/default/xui/zh/menu_notification_well_button.xml: merging in latest changes [35e532cc53d4]

* indra/llui/lltabcontainer.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llimview.cpp: CHUI-571: Fixed bug where when the converation floater was torn off and a new im received, the incorrect conversation would be displayed and focused. In order to do this removed the conversation floater panels from being focused immediately when set visible. Also there was a bug when showing the stub panel for torn off conversations. The tab container was not setting the stub panel index properly to	0, which is where the stub panel existed in the tab container's	list. This is post code review submit. Will submit another with minor code review changes. [0d377019bebb]

2012-12-05 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimcontainer.cpp: CHUI-530 Additional fix [80abc2c40a27]

2012-12-04 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llstartup.cpp: CHUI-504 FIXED Open Conversation floater on first login. added toggleInstanceOrBringToFront("im_container") to LLStartup; typo corr. [a6f882f0cfe6]

2012-12-05 maxim  <maxim@mnikolenko>

* indra/newview/skins/default/xui/en/floater_camera.xml, indra/newview/skins/default/xui/en/floater_destinations.xml, indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/floater_moveview.xml: CHUI-572 FIXED Changed initial position for floaters according to description. [8f119eaa9a95]

2012-12-04 Merov Linden  <merov@lindenlab.com>

* indra/newview/skins/default/textures/bottomtray/Notices_Unread.png, i	ndra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.pn	g, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dar k.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3 _Dark.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_ Off_Dark.png, indra/newview/skins/default/textures/bottomtray/VoiceP TT_On_Dark.png, indra/newview/skins/default/xui/da/menu_im_well_button.xml, indra/ne wview/skins/default/xui/da/menu_notification_well_button.xml, indra/newview/skins/default/xui/de/menu_im_well_button.xml, indra/ne wview/skins/default/xui/de/menu_notification_well_button.xml, indra/ newview/skins/default/xui/en/menu_notification_well_button.xml, indra/newview/skins/default/xui/en/panel_activeim_row.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml, indra/newview/skins/default/xui/es/menu_im_well_button.xml, indra/ne wview/skins/default/xui/es/menu_notification_well_button.xml, indra/newview/skins/default/xui/fr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/fr/menu_notification_well_button.xml, indra/newview/skins/default/xui/it/menu_im_well_button.xml, indra/ne wview/skins/default/xui/it/menu_notification_well_button.xml, indra/newview/skins/default/xui/ja/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ja/menu_notification_well_button.xml, indra/newview/skins/default/xui/pl/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pl/menu_notification_well_button.xml, indra/newview/skins/default/xui/pt/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pt/menu_notification_well_button.xml, indra/newview/skins/default/xui/ru/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ru/menu_notification_well_button.xml, indra/newview/skins/default/xui/tr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/tr/menu_notification_well_button.xml, indra/newview/skins/default/xui/zh/menu_im_well_button.xml, indra/ne wview/skins/default/xui/zh/menu_notification_well_button.xml: Pull merge from richard/viewer-chui [39f6f0445e5c]

* Pull merge from richard/viewer-chui [91446754b1f1]

* indra/newview/llconversationmodel.cpp: CHUI-550, CHUI-551 : Fixed : Changed conversation sorting according to designer's desires. [feed4d4b884a]

2012-12-04 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llchiclet.cpp, indra/newview/llchiclet.h,	indra/newview/llchicletbar.cpp, indra/newview/llchicletbar.h,	indra/newview/llfloaterimsession.cpp, indra/newview/llscriptfloater.cpp, indra/newview/llsyswellwindow.cpp, indra/newview/llsyswellwindow.h,	indra/newview/skins/default/textures/bottomtray/Notices_Unread.png, i	ndra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.pn	g, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dar k.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3 _Dark.png, indra/newview/skins/default/textures/bottomtray/VoicePTT_ Off_Dark.png, indra/newview/skins/default/textures/bottomtray/VoiceP TT_On_Dark.png, indra/newview/skins/default/textures/textures.xml, indra/newview/skins/default/xui/da/menu_im_well_button.xml, indra/ne wview/skins/default/xui/da/menu_notification_well_button.xml, indra/newview/skins/default/xui/de/menu_im_well_button.xml, indra/ne wview/skins/default/xui/de/menu_notification_well_button.xml, indra/ newview/skins/default/xui/en/menu_notification_well_button.xml, indra/newview/skins/default/xui/en/panel_activeim_row.xml, indra/newview/skins/default/xui/en/panel_chiclet_bar.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml, indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml, indra/newview/skins/default/xui/es/menu_im_well_button.xml, indra/ne wview/skins/default/xui/es/menu_notification_well_button.xml, indra/newview/skins/default/xui/fr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/fr/menu_notification_well_button.xml, indra/newview/skins/default/xui/it/menu_im_well_button.xml, indra/ne wview/skins/default/xui/it/menu_notification_well_button.xml, indra/newview/skins/default/xui/ja/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ja/menu_notification_well_button.xml, indra/newview/skins/default/xui/pl/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pl/menu_notification_well_button.xml, indra/newview/skins/default/xui/pt/menu_im_well_button.xml, indra/ne wview/skins/default/xui/pt/menu_notification_well_button.xml, indra/newview/skins/default/xui/ru/menu_im_well_button.xml, indra/ne wview/skins/default/xui/ru/menu_notification_well_button.xml, indra/newview/skins/default/xui/tr/menu_im_well_button.xml, indra/ne wview/skins/default/xui/tr/menu_notification_well_button.xml, indra/newview/skins/default/xui/zh/menu_im_well_button.xml, indra/ne wview/skins/default/xui/zh/menu_notification_well_button.xml: CHUI-573 FIXED Notification chiclet shown when object chiclets are shown [5f644b9779c9]

2012-12-04 maxim  <maxim@mnikolenko>

* Merging [4fd16cf20559]

* indra/newview/llfloaterimcontainer.cpp: CHUI-530 FIXED Using selectConversationPair will show appropriate session floater. [7523a8b906ae]

2012-12-04 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llfloaterimsessiontab.cpp: merging [5a1532f3c051]

2012-12-03 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-556 (Tooltip on call button incorrect when call is active) [9255dc823cd9]

* indra/newview/llconversationview.cpp: CHUI-432 (User that is muted in group call does not show as muted to	other users in conversation list) [fd9bcb435d02]

2012-12-04 maxim  <maxim@mnikolenko>

* indra/newview/skins/default/xui/en/strings.xml: CHUI-527 FIXED Changed term to "Multi-person chat" [d38ff1339229]

2012-12-03 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/skins/default/textures/bottomtray/Unread_IM.png, indra/newview/skins/default/xui/en/menu_im_well_button.xml: merging in latest changes [bbc05dd71941]

* indra/llui/llfolderviewitem.cpp, indra/newview/llconversationview.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llimview.cpp: CHUI-571: Now when the 'Chat Preference' is set to 'Open Conversations window' the conversation line item with flash. The only time it does not flash is when the the conversation line item is already focused. Also fixed various focusing bugs when navigating between conversations and participants. [107889b88365]

2012-12-03 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llbutton.cpp, indra/llui/llflashtimer.cpp, indra/llui/llflashtimer.h, indra/newview/llconversationview.cpp: CHUI-532 FIXED (Viewer crash when user in conversation is removed	from participant list because they logged out or teleported away) delayed destroy of the timer [a81eaab01411]

2012-11-30 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp: CHUI-406 : Fixed again : Update of the P2P session name when not initiating a session was wrong. Add getting the participant name from the session. [6fabaa73a181]

* indra/newview/skins/default/textures/bottomtray/Unread_IM.png, indra/newview/skins/default/xui/en/menu_im_well_button.xml: Pull merge from richard/viewer-chui [9c2a2d713a4c]

* indra/newview/llconversationmodel.cpp: CHUI-404, CHUI-406 : Fixed : update ad-hoc conversation when participant logs off, update title of ad-hoc and P2P to be	consistent with torn off and input field [53bebb13b255]

* indra/newview/llfloaterimsession.cpp: CHUI-570 : Delete a stray debug comment log. [eefa161e2bcf]

* indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsession.h,	indra/newview/llfloaterimsessiontab.cpp: CHUI-570 : Fixed : Take the typing state when updating the title, also make refresh update less frequent (perf). [57ead3fc952b]

2012-11-29 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llchiclet.cpp, indra/newview/llchiclet.h,	indra/newview/llchicletbar.cpp, indra/newview/llsyswellwindow.cpp, indra/newview/skins/default/textures/bottomtray/Unread_IM.png, indra/newview/skins/default/textures/textures.xml, indra/newview/skins/default/xui/en/menu_im_well_button.xml, indra/newview/skins/default/xui/en/panel_chiclet_bar.xml: CHUI-553 FIXED Remove the conversation chiclet [893f114d6f38]

2012-11-29 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [d22d5a5f8901]

* indra/newview/llparticipantlist.cpp: CHUI-552 : Fixed : Filter out participant creation with the same id	than the session id	[6c1bc88e0656]

2012-11-29 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/app_settings/settings.xml, indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-489: Removed the 'Group Messages' checkbox. This was a design change in the spec. [70a50fb720df]

2012-11-28 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-546 FIXED Blank IM toast shown when a nearby chat toast is	shown: Prosessing of the nearby chat was exluded from on_new_message [07795714df35]

2012-11-28 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [b9dab8f805a1]

* indra/newview/llfloaterimnearbychat.cpp: CHUI-552 : Fixed : Do not update the avatars sorting when updating the speaking indicator, let the conversation list do that. [782f2e0f6e48]

* indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimnearbychat.h:	CHUI-552 : Big clean up in nearby chat making it more consistent with LLFloaterIMSessionTab [d4882ff1602f]

2012-11-28 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llfloaterimcontainer.cpp: code cleanup: variables and functions were using the word 'minimized' to refer 'collapsed'. Renamed variables and functions to use the word 'collapsed' instead of 'minimized'. [8c6610b56e24]

* merging in latest changes [fb9986c6b920]

* indra/llui/llfolderviewitem.h, indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llfloaterimcontainer.cpp: CHUI-548: Now a p2p conversation is aligned with the nearby chat arrow. Just had to check for a p2p conversation type and then adjust then decrease the indentation. Also made LLFolderViewItem::drawOpenFolderArrow a non-virtual function and adjusted code accordingly. [4e824a25130d]

2012-11-27 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merging into latest changes [bfc6817a8eda]

* indra/newview/llavataractions.cpp, indra/newview/llvoicevivox.cpp: CHUI-544 (Legacy name shows in conversation list for user that	answers a voice call) [0cf74d78a654]

2012-11-27 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [37e042719adf]

2012-11-26 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfloater.h,	indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llimview.cpp: CHUI-529: Post code review changes. When showing a floater using LLFloater::showInstance instead of setVisibleAndFrontmost. Also made setVisibleAndFrontmost public since both setVisible and setFrontmost are public functions. [94fa6c381784]

* indra/newview/llimview.cpp, indra/newview/skins/paths.xml, indra/newview/skins/steam/xui/da/strings.xml, indra/newview/skins/steam/xui/de/strings.xml, indra/newview/skins/steam/xui/en/strings.xml, indra/newview/skins/steam/xui/es/strings.xml, indra/newview/skins/steam/xui/fr/strings.xml, indra/newview/skins/steam/xui/it/strings.xml, indra/newview/skins/steam/xui/ja/strings.xml, indra/newview/skins/steam/xui/pl/strings.xml, indra/newview/skins/steam/xui/pt/strings.xml, indra/newview/skins/steam/xui/ru/strings.xml, indra/newview/skins/steam/xui/tr/strings.xml, indra/newview/skins/steam/xui/zh/strings.xml: merging in latest changes, resolved llimview.cpp conflict [3475436c7646]

2012-11-16 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimview.cpp: merging in latest changes [4f4baa88cf34]

* indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llimview.cpp, indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-529: Now the conversations floater will appear when the chat preference is set for friend, non-friend, conference, group and nearby chat. [4cb5b56700d4]

2012-11-27 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: merge [49ebc0e0a1e5]

2012-11-26 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: CHUI-542 (Torn off message in conversation panel is not cleared when	torn off conversation is closed) [e982fb9d1919]

2012-11-26 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp: CHUI-528, CHUI-536, CHUI-538, CHUI-540: Fixed the changed item's	highlighting that broke multiselection in inventory and in conversations. [301f58a712f8]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/skins/paths.xml, indra/newview/skins/steam/xui/da/strings.xml, indra/newview/skins/steam/xui/de/strings.xml, indra/newview/skins/steam/xui/en/strings.xml, indra/newview/skins/steam/xui/es/strings.xml, indra/newview/skins/steam/xui/fr/strings.xml, indra/newview/skins/steam/xui/it/strings.xml, indra/newview/skins/steam/xui/ja/strings.xml, indra/newview/skins/steam/xui/pl/strings.xml, indra/newview/skins/steam/xui/pt/strings.xml, indra/newview/skins/steam/xui/ru/strings.xml, indra/newview/skins/steam/xui/tr/strings.xml, indra/newview/skins/steam/xui/zh/strings.xml: Pull merge from richard/viewer-chui [d6267de708cc]

2012-11-21 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimnearbychat.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h:	CHUI-429 : Completed this though it still doesn't work on Nearby Chat. [23b5beeb14c9]

* indra/newview/llconversationmodel.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-429, CHUI-511, CHUI-388 : Multiselection and menus in torn off dialogs [1d096ab0fedf]

2012-11-19 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderview.h, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/llinventoryfunctions.cpp: CHUI-470 : Fixed : Enable contextual menu in torn off conversations [023285670aa9]

2012-11-23 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single	processor of different types of notifications): clean up code [9dd0c9e80809]

* indra/newview/llviewermessage.cpp: CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single	processor of different types of notifications): include flashing for the nearby chat [6e11b422f962]

* indra/llui/llfolderviewitem.cpp: CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single	processor of different types of notifications): changed item's	highlighting [bbfe0321dd2d]

* indra/llui/llflashtimer.cpp, indra/llui/llflashtimer.h: CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single	processor of different types of notifications): repaired LLFlashTimer [8ce7200b37cb]

2012-11-23 maxim  <maxim@mnikolenko>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-530 FIXED Don't switch to new conversation automatically [53b1785202f3]

* indra/newview/llimview.cpp: Additional fix for CHUI-490 (Show "Display Name (user.name)" for the	user that is calling) [116f4d41ad5d]

2012-11-21 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [9150bd6ab73b]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [96aff5e1b226]

2012-11-20 William Todd Stinson  <stinson@lindenlab.com>

* .hgtags, indra/CMakeLists.txt, indra/llcommon/llthread.h,	indra/llrender/llvertexbuffer.cpp, indra/llui/llfloater.cpp, indra/llui/llfloater.h, indra/llui/llfloaterreg.cpp, indra/llui/llnotifications.cpp, indra/llui/llui.cpp, indra/llui/llui.h, indra/llui/lluictrlfactory.cpp, indra/llui/lluictrlfactory.h, indra/llui/llview.cpp, indra/llxml/llxmlnode.cpp, indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llagent.cpp, indra/newview/llappearancemgr.cpp, indra/newview/llappviewer.cpp, indra/newview/llface.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventorymodel.cpp, indra/newview/llnotificationmanager.cpp, indra/newview/llpanelgroupinvite.cpp, indra/newview/llpreviewscript.cpp, indra/newview/llscreenchannel.cpp, indra/newview/llstartup.cpp, indra/newview/llsyswellwindow.cpp, indra/newview/lltexturefetch.cpp, indra/newview/llviewerinventory.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h, indra/newview/llvovolume.cpp, indra/newview/pipeline.cpp, indra/newview/pipeline.h,	indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/strings.xml, indra/newview/skins/paths.xml, indra/newview/skins/steam/xui/da/strings.xml, indra/newview/skins/steam/xui/de/strings.xml, indra/newview/skins/steam/xui/en/strings.xml, indra/newview/skins/steam/xui/es/strings.xml, indra/newview/skins/steam/xui/fr/strings.xml, indra/newview/skins/steam/xui/it/strings.xml, indra/newview/skins/steam/xui/ja/strings.xml, indra/newview/skins/steam/xui/pl/strings.xml, indra/newview/skins/steam/xui/pt/strings.xml, indra/newview/skins/steam/xui/ru/strings.xml, indra/newview/skins/steam/xui/tr/strings.xml, indra/newview/skins/steam/xui/zh/strings.xml: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [6b40d7fb8167]

2012-11-21 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llui/llbutton.cpp, indra/llui/llbutton.h,	indra/llui/llcommandmanager.cpp, indra/llui/llcommandmanager.h,	indra/llui/llflashtimer.cpp, indra/llui/llflashtimer.h,	indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/llui/lltabcontainer.cpp, indra/llui/lltoolbar.cpp, indra/newview/app_settings/commands.xml, indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llfloaterimcontainer.cpp: CHUI-531 FIXED Poor fps in CHUI viewer [eb84337248b6]

2012-11-21 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llfloaterimcontainer.cpp: merge [9b8457aab11b]

* indra/newview/llfloaterimcontainer.cpp: CHUI-535 (Starting a conversation with a user that you have an	existing conversation with can cause the conversation list and	message panel to be out of synch) fixed [fe3091b2910e]

2012-11-21 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llfloaterpreference.cpp: CHUI-523 Additional fix [9c0b876c8d95]

* indra/newview/llfloaterimsessiontab.cpp: CHUI-533 FIXED Check that mConversationsRoot is not null [2af39f72547f]

2012-11-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp, indra/newview/llimview.cpp: CHUI-528, CHUI-536, CHUI-538, CHUI-540 Built single processor of	different types of notifications [996cc77e4d68]

2012-11-20 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/skins/default/xui/en/menu_participant_view.xml: CHUI-522 FIXED Implement check box item 'Keep a conversation log and transcript' [26dcca04f670]

2012-11-20 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llimview.cpp, indra/newview/skins/default/xui/en/floater_incoming_call.xml: CHUI-490 FIXED Small ui changes. Changed sound that is playing when floater is opened. Call startIM when user clicks on "Open IM	instead" button. [ed5239da9c13]

* indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h:	CHUI-523 FIXED Set visibility of warning message depending on combobox state. [9f5b57faf5b4]

* indra/newview/llavataractions.cpp: CHUI-447 Additional fix(Show only display name for user that starts	conversation ) [5cad05e52339]

2012-11-20 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/skins/default/xui/en/widgets/toolbar.xml: CHUI-539 FIXED Chat FUI button flashes indefinitely if Icons Only setting is selected for the button display [eaea969a1e89]

2012-11-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-487, CHUI-488 Commented out demo [134d02f42580]

2012-11-19 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-362 ADD. FIX (When the "Bring back" panel is there, it is not	possible to collapse the right side of the conversation dialog: the	toolbar is completely missing and the "<<" chevrons are not there): This was because the button "<<" belonged session's floater and not the container. Therefore, when all the floaters in the stack becomes invisible, their buttons also become invisible. Solution: Added additional button "<<" in the stub_panel of the container. [bc481dcf3a13]

2012-11-20 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merge [06fbc2d55e08]

2012-11-19 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h:	CHUI-434 (Don't display phone icon and disable phone button when	voice isn't enabled) [99c7e40028d6]

* indra/newview/llchathistory.cpp: CHUI-423 (User typing /me something in chat does not show correctly	in italics on outgoing or incoming chat) [6e4282a55698]

2012-11-19 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llimview.cpp: CHUI-495: Ensuring that a user in do-not-disturb mode can receive voice calls from current conversations. [b09c0f466aa2]

2012-11-19 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llbutton.cpp, indra/newview/skins/default/xui/en/widgets/toolbar.xml: CHUI-488 ADD. fIX Clean up code [142dd6d6d53a]

* indra/newview/app_settings/settings.xml: CHUI-487 ADD. FIX (Revised comments) [cfceaf7f93b6]

2012-11-16 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/CMakeLists.txt, indra/llui/llbutton.cpp, indra/llui/llbutton.h, indra/llui/llflashtimer.cpp, indra/llui/llflashtimer.h, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h, indra/llui/lltabcontainer.cpp, indra/newview/CMakeLists.txt, indra/newview/llflashtimer.cpp, indra/newview/llflashtimer.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp: CHUI-487, CHUI-488 FIXED (Enable flashing FUI button behavior and	Implement Flashing Conversations panel line item behavior): implemented FUI button flashing; clean up code [714ab5ea376a]

* indra/llui/llbutton.cpp, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h, indra/newview/llflashtimer.cpp, indra/newview/llflashtimer.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h: CHUI-487, CHUI-488 W.I.P. #3 (Enable flashing FUI button behavior	and Implement Flashing Conversations panel line item behavior): implemented conversation's item flashing [28b592b4ea20]

2012-11-15 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llflashtimer.cpp, indra/newview/llflashtimer.h: CHUI-487, CHUI-488 W.I.P. #2 (Enable flashing FUI button behavior	and Implement Flashing Conversations panel line item behavior): build new class LLFlashTimer based on	LLSysWellChiclet::FlashToLitTimer; prepared it for general purpose; replaced LLSysWellChiclet::FlashToLitTimer to LLFlashTimer [9c4082bc3d74]

2012-11-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llchiclet.cpp, indra/newview/llchiclet.h: CHUI-487, CHUI-488 W.I.P. #1 (Enable flashing FUI button behavior	and Implement Flashing Conversations panel line item behavior): build new class LLFlashTimer based on	LLSysWellChiclet::FlashToLitTimer; prepared it for general purpose; replaced LLSysWellChiclet::FlashToLitTimer to LLFlashTimer [6b1733eb587b]

2012-11-17 Merov Linden  <merov@lindenlab.com>

* indra/llui/llhandle.h, indra/newview/llconversationview.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/skins/default/xui/de/floater_animation_preview.xml, indra/newview/skins/default/xui/de/floater_inventory.xml, indra/newview/skins/default/xui/de/floater_nearby_chat.xml, indra/newview/skins/default/xui/de/floater_postcard.xml, indra/newview/skins/default/xui/de/menu_bottomtray.xml, indra/newview/skins/default/xui/de/menu_mode_change.xml, indra/newview/skins/default/xui/de/panel_bottomtray.xml, indra/newview/skins/default/xui/de/panel_region_texture.xml, indra/newview/skins/default/xui/de/panel_side_tray.xml, indra/newview/skins/default/xui/es/floater_animation_preview.xml, indra/newview/skins/default/xui/es/floater_inventory.xml, indra/newview/skins/default/xui/es/floater_nearby_chat.xml, indra/newview/skins/default/xui/es/floater_postcard.xml, indra/newview/skins/default/xui/es/menu_bottomtray.xml, indra/newview/skins/default/xui/es/menu_mode_change.xml, indra/newview/skins/default/xui/es/panel_bottomtray.xml, indra/newview/skins/default/xui/es/panel_region_texture.xml, indra/newview/skins/default/xui/es/panel_side_tray.xml, indra/newview/skins/default/xui/fr/floater_animation_preview.xml, indra/newview/skins/default/xui/fr/floater_inventory.xml, indra/newview/skins/default/xui/fr/floater_nearby_chat.xml, indra/newview/skins/default/xui/fr/floater_postcard.xml, indra/newview/skins/default/xui/fr/menu_bottomtray.xml, indra/newview/skins/default/xui/fr/menu_mode_change.xml, indra/newview/skins/default/xui/fr/panel_bottomtray.xml, indra/newview/skins/default/xui/fr/panel_region_texture.xml, indra/newview/skins/default/xui/fr/panel_side_tray.xml, indra/newview/skins/default/xui/it/floater_animation_preview.xml, indra/newview/skins/default/xui/it/floater_inventory.xml, indra/newview/skins/default/xui/it/floater_nearby_chat.xml, indra/newview/skins/default/xui/it/floater_postcard.xml, indra/newview/skins/default/xui/it/menu_bottomtray.xml, indra/newview/skins/default/xui/it/menu_mode_change.xml, indra/newview/skins/default/xui/it/panel_bottomtray.xml, indra/newview/skins/default/xui/it/panel_region_texture.xml, indra/newview/skins/default/xui/it/panel_side_tray.xml, indra/newview/skins/default/xui/ja/floater_animation_preview.xml, indra/newview/skins/default/xui/ja/floater_inventory.xml, indra/newview/skins/default/xui/ja/floater_nearby_chat.xml, indra/newview/skins/default/xui/ja/floater_postcard.xml, indra/newview/skins/default/xui/ja/menu_bottomtray.xml, indra/newview/skins/default/xui/ja/menu_mode_change.xml, indra/newview/skins/default/xui/ja/panel_bottomtray.xml, indra/newview/skins/default/xui/ja/panel_region_texture.xml, indra/newview/skins/default/xui/ja/panel_side_tray.xml, indra/newview/skins/default/xui/pt/floater_animation_preview.xml, indra/newview/skins/default/xui/pt/floater_inventory.xml, indra/newview/skins/default/xui/pt/floater_nearby_chat.xml, indra/newview/skins/default/xui/pt/floater_postcard.xml, indra/newview/skins/default/xui/pt/menu_bottomtray.xml, indra/newview/skins/default/xui/pt/menu_mode_change.xml, indra/newview/skins/default/xui/pt/panel_bottomtray.xml, indra/newview/skins/default/xui/pt/panel_region_texture.xml, indra/newview/skins/default/xui/pt/panel_side_tray.xml, indra/newview/skins/default/xui/ru/floater_animation_preview.xml, indra/newview/skins/default/xui/ru/floater_env_settings.xml, indra/newview/skins/default/xui/ru/floater_inventory.xml, indra/newview/skins/default/xui/ru/floater_nearby_chat.xml, indra/newview/skins/default/xui/ru/floater_postcard.xml, indra/newview/skins/default/xui/ru/floater_water.xml, indra/newview/skins/default/xui/ru/floater_windlight_options.xml, indra/newview/skins/default/xui/ru/menu_bottomtray.xml, indra/newview/skins/default/xui/ru/menu_mode_change.xml, indra/newview/skins/default/xui/ru/panel_bottomtray.xml, indra/newview/skins/default/xui/ru/panel_region_texture.xml, indra/newview/skins/default/xui/ru/panel_side_tray.xml, indra/newview/skins/default/xui/tr/floater_animation_preview.xml, indra/newview/skins/default/xui/tr/floater_env_settings.xml, indra/newview/skins/default/xui/tr/floater_inventory.xml, indra/newview/skins/default/xui/tr/floater_nearby_chat.xml, indra/newview/skins/default/xui/tr/floater_postcard.xml, indra/newview/skins/default/xui/tr/floater_water.xml, indra/newview/skins/default/xui/tr/floater_windlight_options.xml, indra/newview/skins/default/xui/tr/menu_bottomtray.xml, indra/newview/skins/default/xui/tr/menu_mode_change.xml, indra/newview/skins/default/xui/tr/panel_bottomtray.xml, indra/newview/skins/default/xui/tr/panel_region_texture.xml, indra/newview/skins/default/xui/tr/panel_side_tray.xml, indra/newview/skins/default/xui/zh/floater_animation_preview.xml, indra/newview/skins/default/xui/zh/floater_env_settings.xml, indra/newview/skins/default/xui/zh/floater_inventory.xml, indra/newview/skins/default/xui/zh/floater_nearby_chat.xml, indra/newview/skins/default/xui/zh/floater_postcard.xml, indra/newview/skins/default/xui/zh/floater_water.xml, indra/newview/skins/default/xui/zh/floater_windlight_options.xml, indra/newview/skins/default/xui/zh/menu_bottomtray.xml, indra/newview/skins/default/xui/zh/panel_bottomtray.xml, indra/newview/skins/default/xui/zh/panel_region_texture.xml, indra/newview/skins/default/xui/zh/panel_side_tray.xml: Merge pull from richard/viewer-chui [821d26de8817]

* indra/newview/llconversationview.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/lloutputmonitorctrl.cpp, indra/newview/llspeakingindicatormanager.cpp, indra/newview/llspeakingindicatormanager.h:	CHUI-479 : Clean up unecessary tracking code [7539730084af]

2012-11-16 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h:	CHUI-479 : Fixed : Rebuild the root on the LLFloaterIMSession when modifying the session ID	[4b6d6b2b7842]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimsessiontab.cpp: CHUI-479 : WIP : Tracing of LLIMModel::processSessionInitializedReply (to be deleted). [0427c21123df]

2012-11-15 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/lloutputmonitorctrl.cpp, indra/newview/llspeakingindicatormanager.cpp, indra/newview/llspeakingindicatormanager.h:	CHUI-479 : WIP : Introduce a publicly available LLSpeakingIndicatorManager::updateSpeakingIndicators method so to reset all indicators when creating new dialogs. [d18e98b5bf3f]

2012-11-14 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/lloutputmonitorctrl.cpp, indra/newview/llspeakingindicatormanager.cpp: CHUI-479 : WIP : More tracing [0ae28347a405]

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llfloaterimsessiontab.cpp: Merge [899f2414f39a]

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llfloaterimsessiontab.cpp: CHUI-479 : WIP : Small refactoring to allow participant to be added to session whether or not its parent folder is. [fd1c926d08a1]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/lloutputmonitorctrl.cpp, indra/newview/llspeakingindicatormanager.cpp, indra/newview/llspeakingindicatormanager.h:	CHUI-479 : WIP : Add debug tracing into speaking indicator manager and monitors (to be deleted eventually). [b523d6f9ac7c]

2012-11-16 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llimview.cpp: CHUI-518: FIX Removing the LLIMMgr::getInstance as the containing method is already a non-static member method of the same class. [b1cc98afd605]

* indra/newview/llimview.cpp, indra/newview/skins/default/xui/en/notifications.xml: Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [7078c4bdad83]

2012-11-15 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llimview.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewermessage.h,	indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/strings.xml: CHUI-518: WIP First pass as implementing auto-reject voice calls in do not disturb mode. [fe142c7c9aa5]

2012-11-16 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [16668c73f5fc]

2012-11-15 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfloater.cpp, indra/llui/llnotifications.cpp, indra/llui/llnotificationtemplate.h,	indra/newview/llnotificationofferhandler.cpp: CHUI-489: Code review cleanup for both CHUI-489 and CHUI-486. This should be last commit for CHUI-489. [fff411eb5af3]

* indra/newview/llnotificationofferhandler.cpp, indra/newview/lltoastnotifypanel.cpp: CHUI-489: Found a bug in last commit for this issue. The sound notification (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. [d8ef608a720a]

* indra/llui/llfloater.cpp, indra/newview/llimview.cpp: merging in latest changes [7aa89a8680bd]

* indra/llui/llfloater.cpp, indra/llui/llnotifications.cpp, indra/llui/llnotifications.h, indra/newview/llimview.cpp, indra/newview/lltoastnotifypanel.cpp, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-489: Now sounds exist for teleport and inventory offers. The sound is specified in notifications.xml. Also changes for CHUI 486, which allow the user to set preferences for hearing sounds for a New Conversation, Incoming Voice Call, Teleport Offer and Inventory Offer. [c318cf94fedd]

2012-11-15 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-442 FIXED Nearby chat does not open conversations floater when clicking first nearby chat toast in a session [bdd8cff97c0c]

2012-11-16 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/skins/default/xui/en/panel_avatar_list_item.xml, indra/newview/skins/default/xui/en/panel_group_list_item.xml: CHUI-525 FIXED Tootlips are added for Info buttons [ffee9638dca7]

2012-11-15 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llui/llfloater.cpp, indra/llui/llfloater.h:	CHUI-524: The root reason of crash was in the infinity recursion in	the chain of calls LLFloater::setFocus->LLFloater::setFrontmost->LLF loaterView::bringToFront. And problem was not related to CHUI-362. Reviewed by Stinson. [3a13435147e3]

2012-11-15 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp: Backed out changeset: 80bab29003f8 Removing hack fix for CHUI-524. [6b6891648e5a]

* indra/newview/llfloaterimsessiontab.cpp: CHUI-524: FIX Removing a function call that results in a circular logic loop and an eventual stack overflow crash. [80bab29003f8]

2012-11-15 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merging into latest changes [5c4500727357]

* indra/llui/llfolderviewitem.h, indra/newview/llconversationview.cpp, indra/newview/llspeakers.cpp, indra/newview/llspeakers.h:	CHUI-397 (Delay in removing names from participant list in nearby	chat) CHUI-440 (Nearby chat participant list does not clear after	teleport when conversation floater is closed/minimized) fixed [12907fe25aa7]

2012-11-14 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h,	indra/newview/skins/default/xui/en/menu_participant_view.xml: CHUI-501 FIXED Add link to Privacy tab from Comms floater [4db5cacc0c30]

2012-11-14 William Todd Stinson  <stinson@lindenlab.com>

* .hgtags, indra/newview/llflexibleobject.cpp, indra/newview/pipeline.cpp: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [61be5d2c4e58]

2012-11-14 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llchiclet.h, indra/newview/llchicletbar.cpp, indra/newview/llchicletbar.h, indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llconversationloglist.cpp, indra/newview/llconversationloglistitem.cpp, indra/newview/llconversationloglistitem.h,	indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h, indra/newview/llimview.cpp, indra/newview/llimview.h, indra/newview/llsyswellwindow.cpp, indra/newview/llsyswellwindow.h:	CHUI-389 FIXED Added parameter for sessionAdded to get access to has_offline_msg value. Set UnreadIMs icon to visible if messages were sent while offline. [e7568a560709]

2012-11-14 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llinventorybridge.cpp: CHUI-508 FIXED Attach to and Attach to HUD menus not showing in	inventory floater to select attachment point [a9b0ec8405d6]

2012-11-13 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimsession.cpp: CHUI-512 FIXED (New incoming conversations take focus in message	panel only and do not show toasts). Rejected update message when floater hasn't focus [659dd06470bc]

2012-11-13 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimview.cpp: CHUI-486: Post code review changes for last submit, just added in	some parenthesis for conditional statements, thus making them more clear. [fa0b3c6a50fe]

* indra/newview/llimview.cpp: merging in latest changes [5e616f68daff]

* indra/newview/app_settings/settings.xml, indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llimview.cpp, indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-486: Code cleanup, instead of using values such as 0, 1, 2 now using strings 'toast', 'flash', 'none'. These values are used whether to show a notification or not. [7d6b5c92a1ee]

2012-11-12 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llimview.cpp: CHUI-486: Now toasts only appear when proper 'Chat Preference' setting is set to 'Pop Up Message'. [9a652b47aae0]

2012-11-13 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-447 FIXED Set session name as avatar's display name, if session is created by getting new message. [0881c18e7261]

* indra/newview/llconversationview.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h:	CHUI-460 FIXED Reselect floater after toggling the participant list open or closed [6d602ad755d1]

2012-11-12 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llhandle.h, indra/newview/app_settings/settings.xml, indra/newview/skins/default/xui/de/floater_animation_preview.xml, indra/newview/skins/default/xui/de/floater_inventory.xml, indra/newview/skins/default/xui/de/floater_nearby_chat.xml, indra/newview/skins/default/xui/de/floater_postcard.xml, indra/newview/skins/default/xui/de/menu_bottomtray.xml, indra/newview/skins/default/xui/de/menu_mode_change.xml, indra/newview/skins/default/xui/de/panel_bottomtray.xml, indra/newview/skins/default/xui/de/panel_region_texture.xml, indra/newview/skins/default/xui/de/panel_side_tray.xml, indra/newview/skins/default/xui/es/floater_animation_preview.xml, indra/newview/skins/default/xui/es/floater_inventory.xml, indra/newview/skins/default/xui/es/floater_nearby_chat.xml, indra/newview/skins/default/xui/es/floater_postcard.xml, indra/newview/skins/default/xui/es/menu_bottomtray.xml, indra/newview/skins/default/xui/es/menu_mode_change.xml, indra/newview/skins/default/xui/es/panel_bottomtray.xml, indra/newview/skins/default/xui/es/panel_region_texture.xml, indra/newview/skins/default/xui/es/panel_side_tray.xml, indra/newview/skins/default/xui/fr/floater_animation_preview.xml, indra/newview/skins/default/xui/fr/floater_inventory.xml, indra/newview/skins/default/xui/fr/floater_nearby_chat.xml, indra/newview/skins/default/xui/fr/floater_postcard.xml, indra/newview/skins/default/xui/fr/menu_bottomtray.xml, indra/newview/skins/default/xui/fr/menu_mode_change.xml, indra/newview/skins/default/xui/fr/panel_bottomtray.xml, indra/newview/skins/default/xui/fr/panel_region_texture.xml, indra/newview/skins/default/xui/fr/panel_side_tray.xml, indra/newview/skins/default/xui/it/floater_animation_preview.xml, indra/newview/skins/default/xui/it/floater_inventory.xml, indra/newview/skins/default/xui/it/floater_nearby_chat.xml, indra/newview/skins/default/xui/it/floater_postcard.xml, indra/newview/skins/default/xui/it/menu_bottomtray.xml, indra/newview/skins/default/xui/it/menu_mode_change.xml, indra/newview/skins/default/xui/it/panel_bottomtray.xml, indra/newview/skins/default/xui/it/panel_region_texture.xml, indra/newview/skins/default/xui/it/panel_side_tray.xml, indra/newview/skins/default/xui/ja/floater_animation_preview.xml, indra/newview/skins/default/xui/ja/floater_inventory.xml, indra/newview/skins/default/xui/ja/floater_nearby_chat.xml, indra/newview/skins/default/xui/ja/floater_postcard.xml, indra/newview/skins/default/xui/ja/menu_bottomtray.xml, indra/newview/skins/default/xui/ja/menu_mode_change.xml, indra/newview/skins/default/xui/ja/panel_bottomtray.xml, indra/newview/skins/default/xui/ja/panel_region_texture.xml, indra/newview/skins/default/xui/ja/panel_side_tray.xml, indra/newview/skins/default/xui/pt/floater_animation_preview.xml, indra/newview/skins/default/xui/pt/floater_inventory.xml, indra/newview/skins/default/xui/pt/floater_nearby_chat.xml, indra/newview/skins/default/xui/pt/floater_postcard.xml, indra/newview/skins/default/xui/pt/menu_bottomtray.xml, indra/newview/skins/default/xui/pt/menu_mode_change.xml, indra/newview/skins/default/xui/pt/panel_bottomtray.xml, indra/newview/skins/default/xui/pt/panel_region_texture.xml, indra/newview/skins/default/xui/pt/panel_side_tray.xml, indra/newview/skins/default/xui/ru/floater_animation_preview.xml, indra/newview/skins/default/xui/ru/floater_env_settings.xml, indra/newview/skins/default/xui/ru/floater_inventory.xml, indra/newview/skins/default/xui/ru/floater_nearby_chat.xml, indra/newview/skins/default/xui/ru/floater_postcard.xml, indra/newview/skins/default/xui/ru/floater_water.xml, indra/newview/skins/default/xui/ru/floater_windlight_options.xml, indra/newview/skins/default/xui/ru/menu_bottomtray.xml, indra/newview/skins/default/xui/ru/menu_mode_change.xml, indra/newview/skins/default/xui/ru/panel_bottomtray.xml, indra/newview/skins/default/xui/ru/panel_region_texture.xml, indra/newview/skins/default/xui/ru/panel_side_tray.xml, indra/newview/skins/default/xui/tr/floater_animation_preview.xml, indra/newview/skins/default/xui/tr/floater_env_settings.xml, indra/newview/skins/default/xui/tr/floater_inventory.xml, indra/newview/skins/default/xui/tr/floater_nearby_chat.xml, indra/newview/skins/default/xui/tr/floater_postcard.xml, indra/newview/skins/default/xui/tr/floater_water.xml, indra/newview/skins/default/xui/tr/floater_windlight_options.xml, indra/newview/skins/default/xui/tr/menu_bottomtray.xml, indra/newview/skins/default/xui/tr/menu_mode_change.xml, indra/newview/skins/default/xui/tr/panel_bottomtray.xml, indra/newview/skins/default/xui/tr/panel_region_texture.xml, indra/newview/skins/default/xui/tr/panel_side_tray.xml, indra/newview/skins/default/xui/zh/floater_animation_preview.xml, indra/newview/skins/default/xui/zh/floater_env_settings.xml, indra/newview/skins/default/xui/zh/floater_inventory.xml, indra/newview/skins/default/xui/zh/floater_nearby_chat.xml, indra/newview/skins/default/xui/zh/floater_postcard.xml, indra/newview/skins/default/xui/zh/floater_water.xml, indra/newview/skins/default/xui/zh/floater_windlight_options.xml, indra/newview/skins/default/xui/zh/menu_bottomtray.xml, indra/newview/skins/default/xui/zh/panel_bottomtray.xml, indra/newview/skins/default/xui/zh/panel_region_texture.xml, indra/newview/skins/default/xui/zh/panel_side_tray.xml: merging in latest changes [908980556b68]

2012-11-09 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [885dc1bd709f]

* indra/llui/llcheckboxctrl.cpp, indra/llui/llcheckboxctrl.h,	indra/newview/app_settings/settings.xml, indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-486: Now the new chat preferences in drop down lists and checkboxes are storable. These values are accessible globally using gSavedSettings. [9b9abc07a8c9]

2012-11-12 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [979a75a49c7e]

2012-11-09 William Todd Stinson  <stinson@lindenlab.com>

* .hgtags, BuildParams, indra/llcommon/CMakeLists.txt, indra/llcommon/llhandle.h, indra/llcommon/llinitparam.h,	indra/llkdu/llimagej2ckdu.cpp, indra/llrender/llvertexbuffer.cpp, indra/llui/CMakeLists.txt, indra/llui/llfloater.cpp, indra/llui/llhandle.h, indra/llui/lltoggleablemenu.cpp, indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llappearancemgr.cpp, indra/newview/llappviewer.cpp, indra/newview/lldrawable.cpp, indra/newview/llface.cpp, indra/newview/llflexibleobject.cpp, indra/newview/llfloaterland.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventorymodel.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llpanelgroupinvite.cpp, indra/newview/llspatialpartition.cpp, indra/newview/llstartup.cpp, indra/newview/lltexturefetch.cpp, indra/newview/lltoastnotifypanel.cpp, indra/newview/llviewerinventory.cpp, indra/newview/llviewerobject.cpp, indra/newview/llviewerobject.h,	indra/newview/llviewerobjectlist.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h, indra/newview/llvopartgroup.cpp, indra/newview/llvovolume.cpp, indra/newview/llvovolume.h,	indra/newview/pipeline.cpp, indra/newview/pipeline.h,	indra/newview/skins/default/xui/de/floater_animation_preview.xml, indra/newview/skins/default/xui/de/floater_inventory.xml, indra/newview/skins/default/xui/de/floater_nearby_chat.xml, indra/newview/skins/default/xui/de/floater_postcard.xml, indra/newview/skins/default/xui/de/menu_bottomtray.xml, indra/newview/skins/default/xui/de/menu_mode_change.xml, indra/newview/skins/default/xui/de/panel_bottomtray.xml, indra/newview/skins/default/xui/de/panel_region_texture.xml, indra/newview/skins/default/xui/de/panel_side_tray.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/strings.xml, indra/newview/skins/default/xui/es/floater_animation_preview.xml, indra/newview/skins/default/xui/es/floater_inventory.xml, indra/newview/skins/default/xui/es/floater_nearby_chat.xml, indra/newview/skins/default/xui/es/floater_postcard.xml, indra/newview/skins/default/xui/es/menu_bottomtray.xml, indra/newview/skins/default/xui/es/menu_mode_change.xml, indra/newview/skins/default/xui/es/panel_bottomtray.xml, indra/newview/skins/default/xui/es/panel_region_texture.xml, indra/newview/skins/default/xui/es/panel_side_tray.xml, indra/newview/skins/default/xui/fr/floater_animation_preview.xml, indra/newview/skins/default/xui/fr/floater_inventory.xml, indra/newview/skins/default/xui/fr/floater_nearby_chat.xml, indra/newview/skins/default/xui/fr/floater_postcard.xml, indra/newview/skins/default/xui/fr/menu_bottomtray.xml, indra/newview/skins/default/xui/fr/menu_mode_change.xml, indra/newview/skins/default/xui/fr/panel_bottomtray.xml, indra/newview/skins/default/xui/fr/panel_region_texture.xml, indra/newview/skins/default/xui/fr/panel_side_tray.xml, indra/newview/skins/default/xui/it/floater_animation_preview.xml, indra/newview/skins/default/xui/it/floater_inventory.xml, indra/newview/skins/default/xui/it/floater_nearby_chat.xml, indra/newview/skins/default/xui/it/floater_postcard.xml, indra/newview/skins/default/xui/it/menu_bottomtray.xml, indra/newview/skins/default/xui/it/menu_mode_change.xml, indra/newview/skins/default/xui/it/panel_bottomtray.xml, indra/newview/skins/default/xui/it/panel_region_texture.xml, indra/newview/skins/default/xui/it/panel_side_tray.xml, indra/newview/skins/default/xui/ja/floater_animation_preview.xml, indra/newview/skins/default/xui/ja/floater_inventory.xml, indra/newview/skins/default/xui/ja/floater_nearby_chat.xml, indra/newview/skins/default/xui/ja/floater_postcard.xml, indra/newview/skins/default/xui/ja/menu_bottomtray.xml, indra/newview/skins/default/xui/ja/menu_mode_change.xml, indra/newview/skins/default/xui/ja/panel_bottomtray.xml, indra/newview/skins/default/xui/ja/panel_region_texture.xml, indra/newview/skins/default/xui/ja/panel_side_tray.xml, indra/newview/skins/default/xui/pt/floater_animation_preview.xml, indra/newview/skins/default/xui/pt/floater_inventory.xml, indra/newview/skins/default/xui/pt/floater_nearby_chat.xml, indra/newview/skins/default/xui/pt/floater_postcard.xml, indra/newview/skins/default/xui/pt/menu_bottomtray.xml, indra/newview/skins/default/xui/pt/menu_mode_change.xml, indra/newview/skins/default/xui/pt/panel_bottomtray.xml, indra/newview/skins/default/xui/pt/panel_region_texture.xml, indra/newview/skins/default/xui/pt/panel_side_tray.xml, indra/newview/skins/default/xui/ru/floater_animation_preview.xml, indra/newview/skins/default/xui/ru/floater_env_settings.xml, indra/newview/skins/default/xui/ru/floater_inventory.xml, indra/newview/skins/default/xui/ru/floater_nearby_chat.xml, indra/newview/skins/default/xui/ru/floater_postcard.xml, indra/newview/skins/default/xui/ru/floater_water.xml, indra/newview/skins/default/xui/ru/floater_windlight_options.xml, indra/newview/skins/default/xui/ru/menu_bottomtray.xml, indra/newview/skins/default/xui/ru/menu_mode_change.xml, indra/newview/skins/default/xui/ru/panel_bottomtray.xml, indra/newview/skins/default/xui/ru/panel_region_texture.xml, indra/newview/skins/default/xui/ru/panel_side_tray.xml, indra/newview/skins/default/xui/tr/floater_animation_preview.xml, indra/newview/skins/default/xui/tr/floater_env_settings.xml, indra/newview/skins/default/xui/tr/floater_inventory.xml, indra/newview/skins/default/xui/tr/floater_nearby_chat.xml, indra/newview/skins/default/xui/tr/floater_postcard.xml, indra/newview/skins/default/xui/tr/floater_water.xml, indra/newview/skins/default/xui/tr/floater_windlight_options.xml, indra/newview/skins/default/xui/tr/menu_bottomtray.xml, indra/newview/skins/default/xui/tr/menu_mode_change.xml, indra/newview/skins/default/xui/tr/panel_bottomtray.xml, indra/newview/skins/default/xui/tr/panel_region_texture.xml, indra/newview/skins/default/xui/tr/panel_side_tray.xml, indra/newview/skins/default/xui/zh/floater_animation_preview.xml, indra/newview/skins/default/xui/zh/floater_env_settings.xml, indra/newview/skins/default/xui/zh/floater_inventory.xml, indra/newview/skins/default/xui/zh/floater_nearby_chat.xml, indra/newview/skins/default/xui/zh/floater_postcard.xml, indra/newview/skins/default/xui/zh/floater_water.xml, indra/newview/skins/default/xui/zh/floater_windlight_options.xml, indra/newview/skins/default/xui/zh/menu_bottomtray.xml, indra/newview/skins/default/xui/zh/panel_bottomtray.xml, indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/zh/panel_region_texture.xml, indra/newview/skins/default/xui/zh/panel_side_tray.xml: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [c448d26a4836]

2012-11-12 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.h,	indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-362 FIXED (Torn off conversation name is highlighted when	selected in conversation list with different conversation showing in	message panel): connect new method "returnFloaterToHost" to click on	quasi-URL "Bring it back" [722e086f347b]

2012-11-09 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-362 WIP (Torn off conversation name is highlighted when	selected in conversation list with different conversation showing in	message panel): implemented the stub panel and a control of it's	visibility [49f70af1d06b]

* indra/llui/lltabcontainer.cpp, indra/llui/lltabcontainer.h:	CHUI-362 WIP (Torn off conversation name is highlighted when	selected in conversation list with different conversation showing in	message panel): implemented method for a switch off tabs (switching	to an invisible state) [809e21bfd854]

2012-11-12 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-386 FIXED Vertical scrollbar not fully showing in conversation message panel [b4b6a9d839bb]

2012-11-09 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterimsessiontab.cpp: CHUI-479 : WIP : Fixed the missing agent appearance in torn off dialogs by adding a consistency check and rebuild. [c4531033b68e]

* Pull merge from viewer-chui [a6e6929a8d29]

* indra/newview/llfloaterimcontainer.cpp, indra/newview/llspeakers.cpp: CHUI-450 : Fixed how the list of speakers is updated, always add the agent avatar in it, takes voice activation into account [4b755698d1c8]

2012-11-09 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/skins/default/xui/en/strings.xml: CHUI-517: Updating the copy for the avatar in-world name bubble status for Do Not Disturb mode. [7d508b24e43d]

* indra/newview/skins/default/xui/en/panel_preferences_chat.xml, indra/newview/skins/default/xui/en/panel_preferences_general.xml: CHUI-517: Updating the copy in Preferences for Do Not Disturb mode. [5e431d090d1a]

* indra/newview/skins/default/xui/en/panel_preferences_chat.xml: Cleaning up white-space in an xml file. [285af7179ccd]

* indra/newview/skins/default/xui/en/notifications.xml: CHUI-517: Updating notification copy for Do Not Disturb mode. [50d678216607]

* indra/newview/app_settings/settings_per_account.xml, indra/newview/llviewermessage.cpp, indra/newview/skins/default/xui/en/strings.xml: CHUI-517: Updating the do not disturb message automatically sent to	other users when they attempt to contact a person in do not disturb mode. [85c43ff55654]

* indra/newview/llagent.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermenu.h,	indra/newview/skins/default/xui/en/menu_viewer.xml, indra/newview/skins/default/xui/en/strings.xml: CHUI-517: Altering the behavior and copy of the main menu status choices. Busy has been replaced with Do Not Disturb. And both status options have been switched to be indicated with a check rather than alternating text. [c861ce63f47a]

2012-11-09 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llconversationview.cpp: Additional fix for CHUI-473 [25dd7d3dfe23]

2012-11-09 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/CMakeLists.txt, indra/newview/llagent.cpp, indra/newview/llappviewer.cpp, indra/newview/llavataractions.cpp, indra/newview/llavatariconctrl.cpp, indra/newview/llchatbar.cpp, indra/newview/llchatitemscontainerctrl.cpp, indra/newview/llchatitemscontainerctrl.h,	indra/newview/llchiclet.cpp, indra/newview/llchiclet.h,	indra/newview/llchicletbar.cpp, indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llconversationloglistitem.cpp, indra/newview/llconversationloglistitem.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llfloaterconversationpreview.cpp, indra/newview/llfloaterimcontainer.cpp, indra/newview/llfloaterimcontainer.h,	indra/newview/llfloaterimnearbychat.cpp, indra/newview/llfloaterimnearbychat.h,	indra/newview/llfloaterimnearbychathandler.cpp, indra/newview/llfloaterimnearbychathandler.h,	indra/newview/llfloaterimnearbychatlistener.cpp, indra/newview/llfloaterimnearbychatlistener.h,	indra/newview/llfloaterimsession.cpp, indra/newview/llfloaterimsession.h,	indra/newview/llfloaterimsessiontab.cpp, indra/newview/llfloaterimsessiontab.h,	indra/newview/llfloaterpreference.cpp, indra/newview/llfloatertranslationsettings.cpp, indra/newview/llgesturemgr.cpp, indra/newview/llgroupactions.cpp, indra/newview/llgroupiconctrl.cpp, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h, indra/newview/llimpanel.cpp, indra/newview/llimview.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h,	indra/newview/llnearbychatbarlistener.cpp, indra/newview/llnearbychatbarlistener.h,	indra/newview/llnearbychathandler.cpp, indra/newview/llnearbychathandler.h,	indra/newview/llnotificationhandler.h,	indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationmanager.cpp, indra/newview/llnotificationmanager.h,	indra/newview/llnotificationtiphandler.cpp, indra/newview/llparticipantlist.cpp, indra/newview/llscreenchannel.cpp, indra/newview/llscriptfloater.cpp, indra/newview/llstartup.cpp, indra/newview/lltoastnotifypanel.cpp, indra/newview/llviewerfloaterreg.cpp, indra/newview/llviewergesture.cpp, indra/newview/llviewerkeyboard.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp: CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and 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 [e3ebdb812c8a]

2012-11-08 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llvoicevivox.cpp: Pull merge from richard/viewer-chui. [73590f1a17bf]

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h: CHUI-464, CHUI-466, CHUI-474 : Fixed! Better, unified and more consistent use of refreshConversation to update torn off dialogs. [7d1c3c5dde02]

* indra/llui/llfolderviewitem.cpp, indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Pull merge from viewer-chui [5ae4d4488ff1]

2012-11-07 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.h, indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llviewerfloaterreg.cpp, indra/newview/skins/default/xui/en/panel_conversation_list_item.xml: Pull from viewer-chui, had to resolve conflicts on	llimfloatercontainer.cpp [5c6369754f6c]

* indra/newview/llparticipantlist.cpp, indra/newview/llparticipantlist.h: CHUI-468 : Fixed. Final clean up of LLParticipantList, including dependencies. [5bff971c39fd]

* indra/newview/app_settings/settings.xml, indra/newview/llimfloatercontainer.cpp, indra/newview/llparticipantlist.cpp, indra/newview/llparticipantlist.h:	CHUI-468 : WIP : Clean up LLAvatarList and all sorting code left over in LLParticipantList [349992806c68]

2012-11-06 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llparticipantlist.cpp, indra/newview/llparticipantlist.h:	CHUI-468 : WIP : More cleanup and fix of the participants sorting in	LLIMConversation [bd85c48b358e]

2012-11-05 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimconversation.cpp: Pull merge fom viewer-chui-441 [edb1747b271d]

* indra/newview/llconversationview.cpp, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llparticipantlist.cpp, indra/newview/llparticipantlist.h,	indra/newview/skins/default/xui/en/panel_conversation_list_item.xml: CHUI-468 : WIP : Taking LLAvatarList and related out of	LLParticipantList [c0f3ebe4d513]

* indra/newview/CMakeLists.txt, indra/newview/llappviewer.cpp, indra/newview/llcallfloater.cpp, indra/newview/llcallfloater.h,	indra/newview/llviewerfloaterreg.cpp, indra/newview/llvoicevivox.cpp, indra/newview/skins/default/xui/en/floater_voice_controls.xml: CHUI-468 : Suppress LLCallFloater completely [9241864f9277]

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h: CHUI-468 : Suppress LLIMFloater::onParticipantsListChanged. Not useful anymore. [568339733333]

2012-11-05 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimconversation.cpp: CHUI-479: Problem: The parent folder's view model did not store the session id. Because of this, the speaker indicator would be set to a	session id of null (nearby chat). Solution: Now when the folder view model is created in the torn off list, pass in the session id. This allows the folder view model to know which session id it belongs to. Participants can then look at the parent folder (folder view) and retrieve the session id. [5130ec86cbbb]

2012-11-04 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimconversation.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h:	Merge viewer-hui-441 [089dfe0a8f85]

2012-11-02 Merov Linden  <merov@lindenlab.com>

* Pull merge Gil's changes [825676d5ae1d]

* indra/newview/llimconversation.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h: CHUI-481, CHUI-404, CHUI-405, CHUI-406, CHUI-407, CHUI-408 : Fixed! Change the way Ad-hoc and P2P chats update their session name in a	way which is consistent and honor display name. [a365ee41264d]

2012-11-02 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/lllayoutstack.cpp: This does not pertain to a CHUI bug fix but Richard took a look at	the behavior of the layout stack test and found a mathematical bug that caused panels in a layout stack to jitter as they were resized. Submitting in this branch. [704fa6052ee6]

* indra/llui/lllayoutstack.cpp: CHUI-472: This is a fix for the following case: When a torn off floater has its conversation reduced to the minimum width, once re- docked the conversation does not expand. Solution: Discussed problem with Richard, and I'm submitting the changes required to fix the problem. [509071d353df]

2012-11-03 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationview.h,	indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Pull merge from richard/viewer-chui [55063acf4004]

2012-11-02 Merov Linden  <merov@lindenlab.com>

* Pull merge Gil's changes [0699681c2312]

2012-11-01 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [81110ee0544f]

* indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-472: Problem: Only the converation panel was user/auto resizeable but the participants panel was not. By one have only resizable this prevented both panels from being resized. Solution: Now set the participants panel to be user/auto resizable as well. [b7dd9ceb1664]

2012-10-31 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging latest changes [91211905b19e]

2012-11-02 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h:	CHUI-481 : WIP : Make updateSessionName a virtual method of	LLIMConversation so we can eventually call it on events [aa103fad745e]

2012-10-31 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderview.cpp, indra/newview/llimconversation.cpp: CHUI-474 : Fixed. Refresh the participants list in torn off dialog more often. [ceb9de33daaf]

* Merge [dbd4fc8fd04e]

2012-10-30 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/ xui/en/widgets/conversation_view_participant.xml: CHUI-471: Adjusted conversationview so that indentation of the avatar icon is dependent upon getIndentation instead of modifying avatar icon's left value. [f77c6531895a]

2012-10-30 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewmodel.h,	indra/newview/llconversationmodel.cpp: CHUI-463 : Fixed. Allowed a model to be shared by several views. [5ca50a23cc56]

2012-10-29 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/newview/llconversationview.cpp, indra/newview/llimconversation.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Pull merge from richard/viewer-chui [92b7eaf3a6bf]

* indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp: CHUI-469 : Fixed. Add the widget to its map, init the widget map consistently and correctly. [2f4ac178617f]

2012-10-26 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp: CHUI-469 : WIP : Add participants to the nearby chat torn off panel [0fe60f4aadc1]

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/llimfloatercontainer.cpp: CHUI-465 : Add event handling for LLIMConversation participant list [36a264b08bf8]

2012-10-25 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/llui/llfolderviewmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/llimfloatercontainer.cpp: CHUI-441 : WIP : Fix crashes when spawning torn off floaters, added widgets creation in the torn off floater for participants. [2548669a215c]

2012-10-24 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp: CHUI-441 : WIP : Fix the initial attach code so to allow creation of	the conversation item before the dialog [9422008a1bd9]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-441 : WIP : More map clean up and better use of	get_ptr_in_map [d052d7e71f15]

* indra/newview/llimfloatercontainer.cpp: CHUI-441 : WIP : Fixed the creation of empty model records in the list model [fab50ecbf41f]

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-441 : WIP : Initial refactor part 2. Works but the list doesn't	update in the torn off dialog. [e73d781bd653]

2012-10-22 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-441 : WIP : Initial changes to LLIMFloater to use the same model as LLIMFloaterContainer [c2b890ea45f4]

2012-11-08 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llviewermessage.cpp: CHUI-516: Correcting crash when receiving a god-like teleport lure request while in do-not-disturb mode. [6099008a3df8]

* indra/newview/llimview.cpp, indra/newview/llvoicevivox.cpp: Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [32e63d014c05]

* indra/llcharacter/llanimationstates.cpp, indra/llcharacter/llanimationstates.h,	indra/llmessage/llinstantmessage.h,	indra/newview/app_settings/settings_per_account.xml, indra/newview/llagent.cpp, indra/newview/llagent.h,	indra/newview/llappearancemgr.cpp, indra/newview/llavataractions.cpp, indra/newview/llfloaterpreference.cpp, indra/newview/llfloaterpreference.h, indra/newview/llimview.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llnearbychathandler.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermenu.h,	indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h,	indra/newview/llvoicevivox.cpp, indra/newview/skins/default/xui/en/menu_viewer.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/panel_preferences_general.xml, indra/newview/skins/default/xui/en/strings.xml: CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode. [660344ee01ff]

2012-11-07 William Todd Stinson  <stinson@lindenlab.com>

* indra/llmessage/lldbstrings.h, indra/llmessage/llinstantmessage.cpp, indra/llmessage/llinstantmessage.h: Removing unused code. [356838dc05d2]

* indra/newview/llviewermessage.cpp, indra/newview/llviewermessage.h:	CHUI-484: Ensuring that the busy/do-no-disturb message is sent when the user is in the busy/do-not-disturb mode. [78f711cf9bbb]

2012-11-08 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	merging into latest changes [600352c83a08]

2012-11-07 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llspeakers.cpp, indra/newview/llvoicevivox.cpp, indra/newview/llvoicevivox.h:	CHUI-450 (Your own name does not appear in nearby chat participant	list if voice chat disabled) Added audio module initialization without faking mVoiceEnabled value [a3d32f0e9ad2]

2012-11-06 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	CHUI-462 (Torn-off Nearby Chat can't be closed) [176570251988]

2012-11-05 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llvoicevivox.cpp: CHUI-450 (Your own name does not appear in nearby chat participant	list if voice chat disabled) [b6760a51ef51]

2012-11-08 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-387 FIXED (Conversation toasts not shown for open conversations	when conversation floater is in a minimized state or undocked	conversation is minimized): added checking of the minimized state [2f57aa0913e5]

2012-11-07 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llfolderviewitem.cpp, indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	CHUI-473, CHUI-482 FIXED (Clicking on nearby chat toast to open	Conversation floater does not show Nearby Chat conversation selected	in list; Nearby chat conversation is not selected in list by default	when it is the only conversation ): implement. new logic in LLIMFloaterContainer for the syncronous select the conv. list's item and corresponding convers. floater; removed floater selecting from conv. items; fixed bug with item select [d49d7b4e4363]

2012-11-07 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.p	ng, indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne .png, indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ sw.png, indra/newview/skins/default/textures/icons/Conv_toolbar_close.png, i	ndra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png, indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png, indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png, indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.pn	g, indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png, indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png, indra/newview/skins/default/textures/icons/nearby_chat_icon.png: CHUI-514: Updating to Leo's latest icon batch. [ec324ef74251]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [024c42471c47]

2012-11-06 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/skins/default/xui/en/panel_conversation_list_item.xml: Altering the line item phone icon. [8bf9990f8b30]

2012-11-06 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llui/llfolderviewitem.h, indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp: CHUI-448 FIXED p2p IM chat conversations show a participant list with a carat [9f057c49836c]

2012-11-07 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llconversationview.cpp: Fixed postBuild for Ad-hoc conference [c05d9b83e143]

2012-11-06 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [61ea70657f94]

* indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-507: Updated to the new layout of 'Chat Preferences' according to CHUI Notifications spec. The functionality for the new preferences is not yet implemented. [27d81ef3713a]

2012-11-05 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llimconversation.cpp: CHUI-374 FIXED Nearby chat is torn off and cannot be docked if	nearby chat is received while conversation floater is closed [1bf4fea96bf6]

2012-11-06 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llviewerfloaterreg.cpp: CHUI-502 FIXED deleted registering Call floater from FloaterReg [bccbe326fd56]

* indra/newview/llimfloatercontainer.cpp: CHUI-460 FIXED Reselect current conversation on clicking expand/collapse button [f6eab0d72cb2]

2012-11-02 William Todd Stinson  <stinson@lindenlab.com>

* .hgtags, BuildParams, indra/newview/llviewerobjectlist.cpp, indra/newview/llviewerwindow.cpp: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [0e4b86a69dd9]

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/newview/llavatariconctrl.cpp, indra/newview/llavatariconctrl.h,	indra/newview/llavatarlistitem.cpp, indra/newview/llavatarlistitem.h, indra/newview/llchathistory.cpp: CHUI-475: Ensuring that objects that query the avatar name cache with a callback store the connection and disconnect on object destruction. This should help resolve some of the heap corruption we are seeing. [e493a12ee18a]

2012-11-01 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merging into latest changes [92a638b25ff7]

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/newview/llconversationview.h:	CHUI-444 (Click target off when conversation list is minimized to	icons) [ce6fe3fca321]

2012-11-01 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-445 FIXED Select the next conversation in the list when current conversation is deleted [2ece3a5eac47]

* indra/newview/llconversationmodel.cpp: CHUI-446 FIXED Checkm mParent before using dynamic_cast [3a2d379ddac5]

2012-10-31 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/stinson/viewer- chui/. [301582706ae0]

* .hgtags, BuildParams, indra/newview/CMakeLists.txt, indra/newview/llspatialpartition.cpp: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [3a30ccd06f63]

2012-10-31 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llchicletbar.cpp, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h: CHUI-374 ADD. FIX, CHUI-442 FIXED (Nearby chat is torn off and	cannot be docked if nearby chat is received while conversation	floater is closed) - implement. lazy creating of container [901b34f2e68c]

2012-10-30 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/app_settings/settings.xml, indra/newview/skins/default/xui/en/panel_preferences_colors.xml: CHUI-461: Changing the default floater opacities according to Leo's	guidelines. [0f3173b6305f]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llparticipantlist.cpp: CHUI-459: Creating a fetchAvatarName method for the LLConversationItemParticipant class to allow the class to query for the avatar display name directly. Also, added a field to store the avatar name cache callback connection so that we can disconnect properly on object destruction to avoid a crash with the callback attempting to access recently freed memory. [3f1fed9645d0]

2012-10-30 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llimfloatercontainer.cpp: merging into latest changes [ca4373a372ee]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-437 (Conversation floater shows as transparent after being	minimized and unminimized) [c2b9455f365a]

2012-10-30 maxim_productengine  <mnikolenko@productengine.com>

* indra/llui/llfloater.cpp: CHUI-415 FIXED Set focus to dependee floater before removing dependent floater from it	[9892167744e6]

* indra/newview/llconversationmodel.cpp: CHUI-446 FIXED Check that parent_session is not null [14708749dade]

2012-10-26 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llavataractions.cpp, indra/newview/llchiclet.cpp, indra/newview/llgroupactions.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventorypanel.cpp: CHUI-383: Realized that prior changes for this bug caused a regress. The regress was using the people panel or a notecard to start a	im/call with a user. When doing this the conversation line item would not be focused. Resolution: Changed all calls to	LLIMFloater::show to LLIMFloaterContainer::showConversation, which will first select the conversation line item and then show the corresponding conversation floater. [85ab1117b7f2]

* indra/newview/llimfloatercontainer.cpp: merging in latest changes [8c93dbc4bddd]

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/llimfloatercontainer.cpp: CHUI-383: Now a new conversation will not take focus. Instead a	toast will appear. Problem: Each time a conversation was added, code would execute to add the conversation floater AND select the conversation. Resolution: This is no longer the expected behavior so	adjusted LLIMFloater::addToHost to only add a floater and not select/show the floater. If selection and/or showing is needed it	seems to make sense that this is done outside LLIMFloater:addToHost. [f4169299e9df]

2012-10-26 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merging into latest changes [1a21f10130a3]

* indra/llui/llfolderviewitem.cpp: CHUI-439 (Conversation floater is automatically unminimized when a	selected user is removed from nearby chat participant list after	teleport) CHUI-438 (Conversation remains transparent after teleport	with a participant selected in nearby chat) [11a28fdc8d87]

2012-10-26 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-457 FIXED Check that selected participant is not self before performing actions. [4459de000e01]

2012-10-25 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-449: Post code review with Merov, adjusted setConvItemSelect fuction to be called selectConversation. [619985e747f9]

* indra/newview/llconversationview.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-449: Got rid of a function called setItemSelect, I wrote this code and it doesn't have a purpose anymore since I can use setConvItemSelect instead. Also now torn off, minimized conversations are selected when clicking a toast for that conversation. Resolution: Adjusted setConvItemSelect to be less strict when trying to select an item, now as long as the function is called it will attempt to select the conversation line item. [0fea40a0076b]

2012-10-24 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h, indra/newview/llimview.cpp: CHUI-449: Problem: When a toast was clicked, the conversation floater was displayed without selecting the conversation line item. Resolution: Added a function that will show the conversation floater container and then trigger selecting the conversation line item. When the conversation line item is selecting this implicitly will cause the correct conversation floater to be displayed. [6ef3ab86451d]

* indra/newview/llspeakingindicatormanager.cpp: CHUI-363: Problem: Nearby chat is a set to be a null converstation. Because of this, when the voice indicator was set to only show for active conversations...voice indicators inside null conversations were not being turned toggled. Resolution: Now will adjust the speaker indicator even if it exists in a null (nearby chat) conversation. [784c4a48164c]

2012-10-24 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-430 FIXED Open Nearby chat if is is the only conversation in the list. [f11c42d1f1d3]

2012-10-23 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [d1da30308a52]

* indra/llui/llui.cpp: Backed out changeset: 174fccc7016d [e67746116dc5]

2012-10-22 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [64bb60b193e2]

* indra/llui/llfloaterreg.cpp, indra/llui/llfloaterreg.h,	indra/newview/llnearbychat.cpp: Backed out changeset: 4202e227f8e4 [9aaf999a19fb]

2012-10-23 maxim_productengine  <mnikolenko@productengine.com>

* indra/llui/llfolderview.cpp: CHUI-418 FIXED Check that mViewModelItem is not NULL [523bae29ec26]

2012-10-22 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [ed828002cd85]

* indra/newview/llimconversation.cpp, indra/newview/llimview.cpp, indra/newview/llimview.h,	indra/newview/llnotificationhandlerutil.cpp: CHUI-433: Implemented an alternate solution to the problem. The original solution was ambiguous and incomplete and also preserved an existing hack. The new solution removes a hack/deprecated code (setActiveSession/getActiveSession functions). Basically, a toast message is not displayed if the user already has the conversation in focus. When the conversation floater loses focus toasts message will be displayed for that conversation. [e6f4f6a320e4]

* merging in latest changes [03ecc8928502]

2012-10-19 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimconversation.cpp, indra/newview/llimview.cpp: CHUI-433: Problem: Toasts were not being displayed due to incorrect tracking of the current conversation with focus. Resolution: Now when a conversation gains focus it will set a flag to ignore toasts. And when a conversation loses focus it will set a flag to re-enable toasts. [611a2884d62d]

2012-10-22 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-428 (Scroll conversation list to the newly created	conversation) fixed [7cafbcc647b9]

2012-10-19 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [7891476f3d08]

* indra/newview/llspeakers.cpp: CHUI-422 : Add invited non buddies to the initial set of speakers [55281ce0849b]

2012-10-19 William Todd Stinson  <stinson@lindenlab.com>

* indra/llui/lltextbase.cpp: CHUI-243: Add calls the parent class's implementation for onFocusReceived and onFocusLost to ensure that the focus change messages are properly propagated. [70e4da3e8515]

* indra/newview/skins/default/textures/icons/nearby_chat_icon.png: CHUI-391: Replacing nearby chat icon. [e7c4babc0a2e]

* .hgtags, indra/llcommon/llmemory.h, indra/newview/pipeline.cpp: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [96263f92ee3c]

2012-10-19 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-416 FIXED Check if conversationItem is not NULL before calling getType. [e2c238df2f51]

* indra/llui/llfolderview.cpp: CHUI-418 FIXED Check the existence of mViewModelItem before calling potentiallyVisible. [59866acd47ef]

2012-10-18 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [9370d37285b8]

* indra/newview/llfloaterland.cpp: CHUI-373 : Fix : Refresh panel after setting parcel for sale [994536918f2e]

2012-10-18 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: merging in latest changes [0fe4560a47a9]

* indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/xui/en/strings.xml: CHUI-329: Post code review commit, instead of hard coded the parenthesis, created a custom string in string.xml. The reasoning for this is because some languages may not use the parenthesis or	perhaps even use brackets if needed...basically allows for flexibility. [8b8100e22d44]

* indra/newview/llimfloatercontainer.cpp: CHUI-329: The text is now gray due to CHUI 410. The only change in	this commit is that parenthesis surround the nearby chat text (Nearby chat). [f17cd9a76559]

2012-10-18 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merge into latest changes [84d985c74847]

* indra/newview/llimfloatercontainer.cpp: CHUI-412 (User restricted in resizing conversation floater width) fixed [64bc21731ed3]

2012-10-18 Merov Linden  <merov@lindenlab.com>

* CHUI-431 : Merge of VITA changes [8b047f28e022]

2012-10-16 Jeff (Gioffredo Linden)  <gioffredo@lindenlab.com>

* indra/newview/llchathistory.cpp, indra/newview/llchathistory.h:	Move const kw location [3c6eae0c4d43]

* indra/newview/llchathistory.cpp, indra/newview/llchathistory.h:	Make getValue const to fix Windows builds - and be more robust [175d9a5c19b6]

2012-10-12 Jeff (Gioffredo Linden)  <gioffredo@lindenlab.com>

* indra/newview/llchathistory.h:	Fix typo [b6d540c1e73c]

* indra/newview/llchathistory.cpp, indra/newview/llchathistory.h:	Expose Chat history to VITA by adding getValue method to	llchathistory object [5c8da186b9ed]

2012-10-17 Merov Linden  <merov@lindenlab.com>

* indra/newview/lleventpoll.cpp, indra/newview/llimfloater.cpp, indra/newview/llimview.cpp: Pull merge from richard/viewer-chui [a44d14328304]

* indra/newview/llvoicechannel.cpp: CHUI-422 : One last clean up	[31b0cb14d8cc]

* indra/newview/llimfloater.cpp, indra/newview/llimview.cpp, indra/newview/llvoicechannel.cpp: CHUI-422 : Clean up of leftover traces and tests [b6beb4edca5e]

* indra/newview/llavataractions.cpp, indra/newview/lleventpoll.cpp, indra/newview/llimview.cpp, indra/newview/llspeakers.cpp, indra/newview/llspeakers.h:	CHUI-422 : Update the ad-hoc conversation with the known list of on	line agents without waiting for server message (which often doesn't	come...). [753024b5fb01]

* indra/newview/llimview.cpp, indra/newview/llspeakers.cpp, indra/newview/llspeakers.h:	MAINT-1551 : WIP : More tests to elicit a correct answer from the backbone server [9cc427625fbd]

2012-10-15 Merov Linden  <merov@lindenlab.com>

* indra/newview/llavataractions.cpp, indra/newview/llspeakers.cpp, indra/newview/llspeakers.h:	MAINT-1551 : WIP : Added a hack : send an accept invitation message so to trigger the sending of the agent list. [bc1c97ec1de3]

* indra/newview/lleventpoll.cpp, indra/newview/llspeakers.cpp: MAINT-1551 : WIP : Merge [78b3410ef77b]

* indra/newview/llavataractions.cpp, indra/newview/lleventpoll.cpp, indra/newview/llspeakers.cpp: MAINT-1551 : WIP : More IM comm tracing and attempt to fix [12a6e07b1020]

* indra/newview/lleventpoll.cpp, indra/newview/llimfloater.cpp, indra/newview/llimview.cpp, indra/newview/llspeakers.cpp, indra/newview/llvoicechannel.cpp: MAINT-1551 : WIP : Trace IM messaging in and out. [9b173e5c18fe]

2012-10-17 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llchatentry.cpp, indra/llui/llchatentry.h,	indra/llui/lltextbase.cpp, indra/llui/lltextbase.h:	CHUI-410: Post code review submit, changed useLabel to return bool instead of BOOL. Adjusted code accordingly. [ab7fa8deb40f]

* merging in latest changes [fe8e2c127d9c]

* indra/newview/llviewerwindow.cpp: merging in latest code [39b4921c73b3]

* indra/newview/llviewerwindow.cpp: warn-on-failure:unix-eol [580d37d6f114]

* indra/llui/llchatentry.cpp, indra/llui/llchatentry.h,	indra/llui/lltextbase.cpp, indra/llui/lltextbase.h,	indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-410: Now when a converation floater is focused the default text 'To <Some User>' displays only when the text input field is empty. [81afa77101b0]

2012-10-17 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llviewerwindow.cpp: Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [a43b3e041142]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [215a8f420849]

* .hgtags, indra/llcommon/llmemory.h, indra/llcommon/llthread.h,	indra/llmath/CMakeLists.txt, indra/llmath/tests/alignment_test.cpp, indra/llrender/llvertexbuffer.cpp, indra/llui/llfolderview.cpp, indra/newview/CMakeLists.txt, indra/newview/llappviewer.cpp, indra/newview/lldrawable.cpp, indra/newview/lldrawable.h,	indra/newview/lldrawpool.cpp, indra/newview/lldrawpoolterrain.cpp, indra/newview/lldrawpooltree.cpp, indra/newview/llface.cpp, indra/newview/llflexibleobject.cpp, indra/newview/llflexibleobject.h, indra/newview/llfloaterland.cpp, indra/newview/llpanelmarketplaceinbox.cpp, indra/newview/llspatialpartition.cpp, indra/newview/llsurface.cpp, indra/newview/lltexturefetch.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewerobject.cpp, indra/newview/llviewerobject.h,	indra/newview/llviewerobjectlist.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h, indra/newview/llvoavatarself.h,	indra/newview/llvograss.cpp, indra/newview/llvopartgroup.cpp, indra/newview/llvopartgroup.h, indra/newview/llvotree.cpp, indra/newview/llvovolume.cpp, indra/newview/llvovolume.h,	indra/newview/llworld.cpp, indra/newview/pipeline.cpp, indra/newview/pipeline.h,	indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml, indra/newview/skins/default/xui/en/floater_texture_ctrl.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/sidepanel_task_info.xml: Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [c1ec0e82c562]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [cac099c9ca81]

2012-10-16 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [ee66287d7445]

2012-10-03 William Todd Stinson  <stinson@lindenlab.com>

* indra/CMakeLists.txt, indra/cmake/CMakeLists.txt, indra/integration_tests/llimage_libtest/CMakeLists.txt, indra/integration_tests/llui_libtest/CMakeLists.txt, indra/linux_crash_logger/CMakeLists.txt, indra/linux_updater/CMakeLists.txt, indra/llaudio/CMakeLists.txt, indra/llcharacter/CMakeLists.txt, indra/llcommon/CMakeLists.txt, indra/llcrashlogger/CMakeLists.txt, indra/llimage/CMakeLists.txt, indra/llimagej2coj/CMakeLists.txt, indra/llinventory/CMakeLists.txt, indra/llkdu/CMakeLists.txt, indra/llmath/CMakeLists.txt, indra/llmessage/CMakeLists.txt, indra/llplugin/CMakeLists.txt, indra/llplugin/slplugin/CMakeLists.txt, indra/llprimitive/CMakeLists.txt, indra/llrender/CMakeLists.txt, indra/llui/CMakeLists.txt, indra/llvfs/CMakeLists.txt, indra/llwindow/CMakeLists.txt, indra/llxml/CMakeLists.txt, indra/mac_crash_logger/CMakeLists.txt, indra/mac_updater/CMakeLists.txt, indra/media_plugins/base/CMakeLists.txt, indra/media_plugins/example/CMakeLists.txt, indra/media_plugins/gstreamer010/CMakeLists.txt, indra/media_plugins/quicktime/CMakeLists.txt, indra/media_plugins/webkit/CMakeLists.txt, indra/media_plugins/winmmshim/CMakeLists.txt, indra/newview/CMakeLists.txt, indra/test/CMakeLists.txt, indra/test_apps/llplugintest/CMakeLists.txt, indra/viewer_components/login/CMakeLists.txt, indra/viewer_components/updater/CMakeLists.txt, indra/win_crash_logger/CMakeLists.txt, indra/win_updater/CMakeLists.txt: Backed out changeset: eb957fafe167 [6f2564bdcc33]

* indra/newview/CMakeLists.txt: Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [8831c5045f79]

2012-09-21 William Todd Stinson  <stinson@lindenlab.com>

* indra/CMakeLists.txt, indra/cmake/CMakeLists.txt, indra/integration_tests/llimage_libtest/CMakeLists.txt, indra/integration_tests/llui_libtest/CMakeLists.txt, indra/linux_crash_logger/CMakeLists.txt, indra/linux_updater/CMakeLists.txt, indra/llaudio/CMakeLists.txt, indra/llcharacter/CMakeLists.txt, indra/llcommon/CMakeLists.txt, indra/llcrashlogger/CMakeLists.txt, indra/llimage/CMakeLists.txt, indra/llimagej2coj/CMakeLists.txt, indra/llinventory/CMakeLists.txt, indra/llkdu/CMakeLists.txt, indra/llmath/CMakeLists.txt, indra/llmessage/CMakeLists.txt, indra/llplugin/CMakeLists.txt, indra/llplugin/slplugin/CMakeLists.txt, indra/llprimitive/CMakeLists.txt, indra/llrender/CMakeLists.txt, indra/llui/CMakeLists.txt, indra/llvfs/CMakeLists.txt, indra/llwindow/CMakeLists.txt, indra/llxml/CMakeLists.txt, indra/mac_crash_logger/CMakeLists.txt, indra/mac_updater/CMakeLists.txt, indra/media_plugins/base/CMakeLists.txt, indra/media_plugins/example/CMakeLists.txt, indra/media_plugins/gstreamer010/CMakeLists.txt, indra/media_plugins/quicktime/CMakeLists.txt, indra/media_plugins/webkit/CMakeLists.txt, indra/media_plugins/winmmshim/CMakeLists.txt, indra/newview/CMakeLists.txt, indra/test/CMakeLists.txt, indra/test_apps/llplugintest/CMakeLists.txt, indra/viewer_components/login/CMakeLists.txt, indra/viewer_components/updater/CMakeLists.txt, indra/win_crash_logger/CMakeLists.txt, indra/win_updater/CMakeLists.txt: Adding the CXX to each CMake project definition. [eb957fafe167]

2012-10-18 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merging in latest changes [b205f652ffb4]

* indra/newview/llviewerwindow.cpp: CHUI-399 (When user has Pressing Letter Keys starts local chat	setting on, first presses of letter keys do not open chat) fixed [d1ac564124cf]

2012-10-17 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llconversationview.cpp: CHUI-419 FIXED Selecting the drop down arrow to list participants for a conversation does not select that conversation [db6853cc7a7b]

* indra/llui/llmenugl.cpp, indra/llui/llmenugl.h,	indra/llui/lltoggleablemenu.cpp, indra/llui/lltoggleablemenu.h,	indra/newview/llconversationmodel.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llinventorybridge.cpp, indra/newview/llparticipantlist.cpp, indra/newview/llparticipantlist.h,	indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-394 FIXED Group moderation tools missing in right click menus [82c83c860e70]

2012-10-16 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [47289fb255eb]

* indra/newview/llconversationview.cpp, indra/newview/llimfloatercontainer.h:	CHUI-380: Realized that the when clicking the participant/conversation item that the active session wasn't being stored. This caused the right side conversation floater to not change when selecting a participant under a conersation. Resolution: now when clicking on a conversation or participant the active session is stored using setActiveSession. [6601d9f7983a]

2012-10-16 maxim_productengine  <mnikolenko@productengine.com>

* indra/llui/llmenugl.cpp, indra/newview/llconversationmodel.cpp: CHUI-388 FIXED Do not add menu items to Participant Menu if own avatar is selected in participant list. Do not show Menu if all menu items are disabled. [0651850bafdd]

2012-10-15 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationview.cpp: CHUI-380: Bug fix after merge. When selecting the participant of a	conversation focus would be lost on the converstation floater. This was because focus would be set to the participant folder item. Resolution: Now delegate focus from the particiapnt folder item to the conversation floater. [2c6c5ffedb15]

* indra/newview/llimfloatercontainer.cpp: CHUI-380: Merge fix, the addConverationListItem API was changedso that it does not by default select the new conversation item. Adjusted sessionAdded and sessionVoiceOrImStarted functions to	specify that the first item should be selected when calling addConversationListItem. [2d0e5a276873]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h, indra/newview/llimview.cpp: merging in latest changes [6dae462dcd83]

* indra/llkdu/llimagej2ckdu.cpp, indra/newview/llchiclet.h,	indra/newview/llchicletbar.h, indra/newview/llconversationlog.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h, indra/newview/llimview.cpp, indra/newview/llimview.h, indra/newview/llsyswellwindow.h: CHUI-380: Final commit for this issue. After code review changed some method names to be more accurate. Also using dynamic_cast instead of static_cast for safety. [b4df228f7dfb]

2012-10-12 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llkdu/llimagej2ckdu.cpp, indra/newview/llchiclet.h,	indra/newview/llchicletbar.h, indra/newview/llconversationlog.h,	indra/newview/llconversationview.cpp, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h, indra/newview/llimview.cpp, indra/newview/llimview.h, indra/newview/llsyswellwindow.h:	CHUI-380: (In progress) Refactoring needed to fix focusing issues when selecting an existing conversation item. This commit resolves re-introducing bug CHUI-289. Will code review and cleanup code in next commit. [4e61e05b5fbf]

2012-10-11 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/llimconversation.cpp, indra/newview/llimfloater.cpp, indra/newview/llnearbychat.cpp: CHUI-380: Fixing a bug that occurred when right clicking nearby chat and then right clicking a participant under a conversation. This would result in both the participant and conversation to be highlighted. Still a work in progress. This change involves introducing an old bug CHUI 289 and finding a different approach to solving it. [f0561005d472]

* indra/newview/llconversationview.cpp, indra/newview/llimfloater.cpp: merging in latest changes [4f06965cbd4b]

* indra/newview/llimfloater.cpp, indra/newview/llnearbychat.cpp: CHUI-380: Code cleanup after code review. [fbd7c91f7ea7]

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h: CHUI-380: Before code review changes. Now the user selects a	conversation or participant of a conversation the correct chat floater will appear. Focus will be redirected to the chat input text box automatically allowing the user to type into the input text box. [9cd168d3077c]

2012-10-15 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-400 FIXED Disable "Activate Group" menu item if selected group is the active group [19eb1517d73c]

2012-10-12 Merov Linden  <merov@lindenlab.com>

* .hgtags: CHUI Project Viewer initial revision [628210b2d8fa]

2012-10-12 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h, indra/newview/llimview.cpp: CHUI-385 FIXED All user's do not receive ad hoc messages after adding a user to a conversation [092a9effbedd] [CHUI-PV-0]

2012-10-12 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-402 (Double-click on conversation participant should begin IM	session) [761cbdbd98e6]

2012-10-11 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-356 FIXED Call notifyObserverSessionIDUpdated only after initing IM floater with new session id	[c6fe3090927f]

2012-10-11 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llimconversation.cpp: CHUI-377 (Icons in message panel out of position when nearby chat	conversation selected) Fixed bug with collapsing messages pane [77b75a25e39a]

2012-10-10 MaximB ProductEngine  <mberezhnoy@productengine.com>

* merge changes [aa23a5c6607d]

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h:	CHUI-377 (Icons in message panel out of position when nearby chat	conversation selected) FIXED [858b9af6f747]

2012-10-09 Merov Linden  <merov@lindenlab.com>

* indra/llui/llui.cpp: CHUI-375 : Fixed default parameters changed in methods profile but not in binding calls. [174fccc7016d]

* indra/newview/skins/default/xui/en/menu_participant_view.xml: CHUI-393 : Suppress the sort participants by distance from you menu item. Kept the code around. [637fbc0b828b]

2012-10-08 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [3f515455f579]

* indra/newview/llavataractions.cpp, indra/newview/llavataractions.h,	indra/newview/llconversationmodel.cpp: CHUI-147 : Sort the residents names when getting a resident string list [b8f2fc79441e]

2012-10-08 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-331 (Resizing conversation list when message panel is collapsed	does not resize list) fixed [607cd536b56f]

2012-10-08 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-390 FIXED Selecting Chat History option from right click menu on a conversation name does not open chat history viewer [4c9ce98a093e]

2012-10-05 Merov Linden  <merov@lindenlab.com>

* indra/newview/llavataractions.cpp, indra/newview/llavataractions.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h, indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp: CHUI-194 : WIP : Update the ad-hoc conversation line item title, add a new update_session event. Still some clean up to do. [3ad039128f26]

* indra/newview/llconversationview.cpp: CHUI-364 : Fixed. Do not render participants widgets when closing a	conversation handle. [6e67371ea3ca]

2012-10-04 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [1c0d2b1723c7]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-381 : Implement add_participant and update_participant events handling. [7801aa5f678f]

2012-10-04 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/llui/lllayoutstack.cpp: CHUI-331 FIXED (Resizing conversation list when message panel is	collapsed does not resize list) *fixed missing parentheses from last push [4f51e28ce410]

2012-10-04 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-327 FIXED Set "left" property for chat_history element [46e48dd4c84c]

* indra/newview/skins/default/xui/en/menu_viewer.xml: CHUI-313 FIXED "Conversations", "Conversations Log" menu items are added [f986eea6675b]

2012-10-03 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llimfloatercontainer.cpp: CHUI-341 : Fixed. Took Nat's review comments into account. [437101474435]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Pull merge from richard/viewer-chui [93121061c00c]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Pull merge from richard/viewer-chui [85287914bd83]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp: CHUI-358 : Fixed the removal of participants as they leave conversations. Used the event mechanism for this. [2477a2c7b016]

2012-10-02 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-341 : Implement the use of LLEventStream and LLEventPump to signal conversation model changes, picked by LLIMFloaterContainer. Suppress pooling on draw. [c20e7235ff3d]

2012-10-03 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [f96006d526bb]

* merging in latest changes [d483a5f29063]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-102: Now the options enabled in the one-on-one conversation menu are the same as the participants menu. In prior commits the one-on-one conversations menu was not enabling/disabling the proper menu options. [4985af2095f6]

2012-10-04 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llavataractions.cpp: CHUI-165 FIXED Add access to Conversation Log and Chat History from the People floater: the 'View Chat History' action was updated; [5d3e68db43c5]

* merge changes [50f3fd536954]

2012-10-04 MaximB ProductEngine  <mberezhnoy@productengine.com>

* indra/llui/lllayoutstack.cpp: CHUI-331 FIXED (Resizing conversation list when message panel is	collapsed does not resize list) [933a14ac924f]

2012-10-03 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llappviewer.cpp, indra/newview/llcallfloater.cpp, indra/newview/llcallfloater.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-378 FIXED (Conversation floater is not opened if call initiated	and accepted with conversation floater closed - goes to voice	settings floater): added open conversation floater on the voice channel's changing [8ea775b76e96]

2012-10-03 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llviewermenu.cpp, indra/newview/skins/default/xui/en/menu_viewer.xml: CHUI-322 FIXED Call SideTray.PanelPeopleTab with parameter="blocked_panel" instead of Communicate.BlockList [87cc7946342c]

* indra/newview/skins/default/xui/en/floater_conversation_log.xml, ind ra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml :	CHUI-301 FIXED Tooltips for buttons are added [4cfaae6f9366]

* indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h:	CHUI-354 FIXED getIconOverlay is added for LLItemBridge [b36fc93f3240]

2012-10-02 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h,	indra/newview/llnearbychathandler.cpp, indra/newview/llviewerfloaterreg.cpp: CHUI-374 FIXED (Nearby chat is torn off and cannot be docked if	nearby chat is received while conversation floater is closed) Nearby_chat is created only after the creation of the im_container [4682d8f097d6]

2012-10-02 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [36daaa05dc6e]

* indra/newview/llimfloatercontainer.cpp: CHUI-102: Code review, just changed function getCurSelectedViewModelItem to have a single return statement. [891442050897]

* indra/newview/llconversationmodel.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-102: Now the options menu (right-click menu) for a	participant/conversation will open the 'Chat history' dialog when selected. [d304657623a3]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp: CHUI-102: Now the user can select a conversation and use the right- click-menu to enable/disable voice. [07675f7ebef2]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-102: Code cleanup, decoupling code and made specific methods for handling menu events for conversations or participants. [6aff42c0085b]

2012-10-01 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-102: Right clicking on a group conversation brings up the correct menu. The user can now view the group profile, activate the group and leave the group. [5d7281899ff2]

2012-10-02 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/app_settings/commands.xml, indra/newview/skins/default/xui/en/menu_viewer.xml: CHUI-190 (Remove the Voice Settings floater): removed the menu item "Communicate > Voice settings" and the FUI button (headphones) from the Toybox (Toolbox). I left a floater in the project to be able to reconnect it to a different location. [13071defd1f9]

2012-10-01 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [12a7d32bf33f]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h, indra/newview/llimfloater.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llinventorypanel.cpp: merging in latest changes [db16abce21a4]

* indra/llui/llfolderview.cpp, indra/llui/llfolderview.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h, indra/newview/llimfloater.h,	indra/newview/llimfloatercontainer.cpp: CHUI-102: Cleaned up code after code review. [df0a95843c00]

2012-09-28 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfolderview.cpp, indra/llui/llfolderview.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h, indra/newview/llimfloater.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llinventorypanel.cpp, indra/newview/skins/default/xui/en/menu_conversation.xml: CHUI-102: Now the participants and one-on-one conversations have right-click-menus. These menus are functional as well, but 'chat history' does not yet work. [49c564559bde]

2012-10-01 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/llui/llfolderviewitem.cpp: CHUI-368 FIXED Lock icon shown when clicking on items in inventory [14a92b059aa8]

2012-09-28 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp: CHUI-357 FIXED moved conversation icon to prevent it being obscured when conversations list is minimized. Added minimized mode for LLConversationViewSession: this mode is used to move the conversation icon within the item when the conversations panel is minimized. [0ce296547cd2]

2012-09-28 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-361 FIXED (Viewer crash when selecting to start IM with user	from right click menu in people floater ): prevent destruction of	im_container; suppress warning for the nearby_chat [e765ec2286eb]

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/llimfloatercontainer.cpp: CHUI-349 (Crash when clicking on nearby chat toast): removed a	faulty method LLIMFloater::addToIMContainer; replaced it's calls to	calls of its correct twin - LLIMFloater::addToHost [7b790b5497b8]

2012-09-28 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterchatvoicevolume.cpp, indra/newview/llfloaterchatvoicevolume.h:	CHUI-345 : Add mandatory license to the files [d99305e63820]

* indra/newview/llimfloatercontainer.cpp: Mer ge pull from richard/viewer-chui [b64defef81de]

* indra/llui/llview.cpp, indra/llui/llview.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h:	CHUI-367 : Completed : Show user name tooltip in all situations so	to avoid the conversation name showing up	[db1019dfe228]

* indra/newview/llimfloatercontainer.cpp: CHUI-366 : Completed : Update participants names when the display name pref is toggled on and off. [0cdf4b711a64]

* indra/llui/llview.cpp, indra/llui/llview.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-342, CHUI-366 and CHUI-367 : WIP : Allow a NO_TOOLTIP value for tooltips, update display/user names and sort on display/user names [7159e589f0a6]

2012-09-28 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llnearbychat.cpp: CHUI-370, CHUI-372 ADDITIONAL FIX (Viewer crash when voice calling	another user from people panel then opening conversation floater or	when starting a IM chat when conversation floater has not been	previously opened): fixed nearby chat positioning [4c265cfef005]

2012-09-28 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/CMakeLists.txt, indra/newview/llfloaterchatvoicevolume.cpp, indra/newview/llfloaterchatvoicevolume.h,	indra/newview/lloutputmonitorctrl.cpp, indra/newview/llviewerfloaterreg.cpp, indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml: CHUI-345 ADDITIONAL FIX (LLConversationViewSession: enable speaking	indicator)

- Clicking on the conversation speaking icon brings up the volume floater for voice conversations [31b148c05613]

2012-09-27 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llnearbychat.cpp: CHUI-370, CHUI-372 FIXED Viewer crash when voice calling another user from people panel then opening conversation floater or when starting a IM chat when conversation floater has not been previously opened: connecting floater to the host postponed until the end of	its initialization [8a29b719b430]

2012-09-27 maksymsproductengine  <maksymsproductengine@lindenlab.com>

* indra/newview/llavataractions.cpp, indra/newview/llavataractions.h,	indra/newview/llpanelpeoplemenus.cpp, indra/newview/skins/default/xui/en/menu_people_friends_view.xml, indra/newview/skins/default/xui/en/menu_people_nearby.xml: CHUI-165 FIXED Add access to Conversation Log and Chat History from the People floater. [1097447cc7d5]

2012-09-27 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llinventorypanel.cpp: CHUI-352 FIXED (Viewer crash when dropping a worn attachment): getting the item's id before destruction corresponding viewmodel's	item [62f040bc2ed8]

2012-09-27 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/lloutputmonitorctrl.cpp, indra/newview/lloutputmonitorctrl.h:	CHUI-346 ADDITIONAL FIX (LLConversationViewSession: enable current	voice channel indicator)

- When voice initialized show voice channel indicator for nearby chat session [56ffbc7e9f14]

2012-09-26 Merov Linden  <merov@lindenlab.com>

* indra/newview/lloutputmonitorctrl.cpp: CHUI-344 : Fix Mac build issue introduced by previous fix attempt [2e040fb40362]

* Pull merge from richard/viewer-chui [f298dfa5c361]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-364 : WIP : Suppress unused code [d4405334586e]

2012-09-26 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h, indra/newview/llnearbychat.cpp, indra/newview/lloutputmonitorctrl.cpp, indra/newview/lloutputmonitorctrl.h,	indra/newview/skins/default/textures/icons/nearby_chat_icon.png, indra/newview/skins/default/textures/textures.xml, indra/newview/skins/default/xui/en/panel_conversation_list_item.xml: CHUI-344 FIXED (LLConversationViewSession: enable icon update)

- This commit also fixes CHUI-345 CHUI-346 [853492d1877f]

2012-09-26 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp: Pull merge from richard/viewer-chui [404bb9bccc12]

2012-09-25 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h: CHUI-342 : Fixed : Use user name and display name correctly. Sort according to user names. [0284e9a3c734]

2012-09-26 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/newview/llconversationview.cpp: CHUI-347 FIXED drawing selected conversation item background. Moved some duplicating pieces of code from LLFolderViewFolder::draw and LLFolderViewItem::draw to separate methods to reduce code duplication in LLConversationViewSession::draw. Changed some static variables in LLFolderViewItem to static members for using them in derived LLConversationViewSession. [76f97265c6aa]

2012-09-25 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp: CHUI-329 : WIP : Always sort Nearby Chat to be on top of the list [1c8c3736602b]

* Merge pull from richard/viewer-chui [2e3dc4a4fbf4]

2012-09-24 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewmodel.h,	indra/newview/llconversationmodel.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llparticipantlist.cpp: CHUI-340 : Fix dupe items in the conversation model list. Refresh when resorting. [e7e428e0615a]

2012-09-21 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-340 : Implement distance computation and update [820714cc458b]

2012-09-24 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llnearbychat.h:	CHUI-355 FIXED Nearby chat entries do not appear in torn off nearby chat window when opening from a toast: fix for visual studio and XCode [538fe678ed92]

* indra/llui/llfloater.cpp, indra/llui/llfloater.h,	indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	CHUI-355 FIXED Nearby chat entries do not appear in torn off nearby chat window when opening from a toast: moved setIsSingleInstance from constructor to postBuild for prevent of a resetting it in	buildFromXML; implemented correct set of mReuseInstance; changed type of the key of LLIMConversation from LLUUID to LLSD [a0ebfb6de7ce]

2012-09-24 maxim_productengine  <mnikolenko@productengine.com>

* indra/newview/llnotificationscripthandler.cpp: CHUI-309 FIXED Use onRemoveNotification only for "LoadWebPage", "ScriptDialog" and "ScriptDialogGroup" notifications [bf036520f93f]

* indra/newview/llimconversation.cpp, indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-123 FIXED Tooltips for buttons are added [caf4bc7106ac]

* indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-124 FIXED Tooltips for buttons are added [d70819ff7286]

2012-09-21 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Pull merge from richard/viewer-chui [e60f4e9cf218]

* indra/llui/llfolderviewmodel.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimconversation.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llnearbychat.cpp, indra/newview/llparticipantlist.cpp: CHUI-340 : WIP : Fix sorting bugs on time for sessions, simplified the update time mechanism and clean up	[a79fcb72c4a5]

2012-09-20 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h, indra/newview/llimfloater.cpp, indra/newview/llnearbychat.cpp, indra/newview/llparticipantlist.cpp: CHUI-340 : WIP : Implement time update on all IM typing cases [0ce77d6a2f55]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llparticipantlist.cpp: CHUI-340 : WIP : Implement time update and comparison for sessions and participants [d190c8ac064e]

* indra/newview/llspeakers.cpp: CHUI-340 : WIP : Fix the event firing from LLSpeakerMgr to	LLParticipantList [9affb86a1d16]

2012-09-19 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloater.cpp, indra/newview/llnearbychat.cpp, indra/newview/llparticipantlist.cpp, indra/newview/llparticipantlist.h, indra/newview/llspeakers.cpp, indra/newview/llspeakers.h:	CHUI-340 : WIP : Update time stamp for IM and voice utterance [601ed54bb86f]

2012-09-21 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationview.cpp: CHUI-283: Now the mouse over highlight only shows up when hovering over a participant. Before there was a bug where the onMouseLeave function was not being called. This prevented the mouse-over- highlight from turning off. [2bdbc34c3d99]

* merging in latest changes [6dc15cdcae91]

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h, indra/newview/skins/default/xui/ en/widgets/conversation_view_participant.xml: CHUI-283: Now the speaker/info icon positions are set based upon visibility.' [2e588c18cb9f]

2012-09-20 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfolderview.cpp: CHUI-283: within LLFolderView::scrollToShowItem, adjusted the calculation that scrolls to the selected item. My prior commit changed this calculation and adjusted it in this commit to preserve prior behavior. [1aae6db4c936]

* indra/llui/llfolderview.cpp, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h, indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/skins/default/xui/en/panel_outbox_inventory.xml, indra /newview/skins/default/xui/en/widgets/conversation_view_participant. xml, indra/newview/skins/default/xui/en/widgets/conversation_view_se ssion.xml, indra/newview/skins/default/xui/en/widgets/folder_view_item.xml, ind ra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml :	CHUI-283: Refactor of how the layout is determined for LLFolderViewItem. Changed constant members that defined the layout to non-const member varaibles, which are populated using a .xml file. [dc1f65b4031b]

* indra/llui/llfolderviewitem.cpp: CHUI-353: Regress Bug caused by a CHUI 283 commit. Problem: The font was rendering differently due to the folderviewitem::draw method calling llview::draw. I added llview::draw initially but it is not longer needed. Resolution: Removing the call to llview::draw. [a242d1089120]

2012-09-21 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h:	CHUI-289 ADDITIONAL FIX (Newly added conversation is not selected in	conversation list): gave more meaningful names to variables [442d2ac0073d]

* indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h: CHUI-289 ADD. FIX (Newly added conversation is not selected in	conversation list): Select item which was added from avatar picker [e3407ba478f9]

2012-09-19 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llavatariconctrl.cpp, indra/newview/llfloaterconversationpreview.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h,	indra/newview/skins/default/xui/en/floater_conversation_preview.xml: CHUI-338 FIXED (LLAvatarNameResponder warning shown in debug console	when using spinner to page through chat history viewer)

- Trying to restore avatarID by its name before appending message to chat history. - Also prevented requesting avatar name by null LLUUID in	LLAvatarIconCtrl::setValue [cf63ae145a2c]

2012-09-18 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h:	Regress Fix: After a CHUI 283 commit the inventory items suffix was overlapping text. Problem was that a variable storing the width of	the text was not passed in as a reference, which always resulted in the suffix overlapping the prior text. [4bd9ee9494da]

* indra/newview/llconversationmodel.h:	merging in latest changes [accc8cb450ff]

* indra/llcommon/llfoldertype.h, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llviewerfoldertype.cpp, indra/newview/skins/default/xui/en/floater_pathfinding_console.xml, i	ndra/newview/skins/default/xui/en/widgets/conversation_view_particip ant.xml: CHUI-283: Now the avatar icon loads in the user's avatar image.Also the avatar image is of proper size. The participant of the conversation is offset correctly as well. [2448ae197ce7]

2012-09-18 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llconversationloglistitem.cpp: CHUI-348 FIXED (Voice call icon still shows in conversation log)

- Removed code responsible for showing voice icon [0b0d16ff2a51]

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h, indra/newview/llimview.cpp, indra/newview/llimview.h:	CHUI-339 FIXED (2 entries shown in conversation log for ad hoc	conference for user that starts the conference) [8bbe5a5038c8]

2012-09-17 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: Pull merge from richard/viewer-chui [b47565bfef74]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llparticipantlist.cpp: CHUI-340 : WIP : Sorting implemented. Type and name work. Date and distance still need the relevant values to be computed. [438efd555b04]

2012-09-17 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: merging in latest changes [1917b592ac1e]

2012-09-14 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: merging in latest changes [bbc3e2d3b8f3]

* indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/ xui/en/widgets/conversation_view_participant.xml: CHUI-283: Now the info/speaker icon are better positioned within the participant item. Also the participant item now matches the height of the session (conversation) item. [33dcf25d2d4e]

2012-09-14 Merov Linden  <merov@lindenlab.com>

* indra/newview/app_settings/settings.xml, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/skins/default/xui/en/menu_participant_view.xml: CHUI-192 : Implement menus and settings for sorting. The sort itself is not performed though. Wait for CHUI-340 for this. [dad2b78fd59f]

2012-09-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp: CHUI-261 Additional fix (Nearby chat controls and log are not	visible on next login after tearing off and docking nearby chat in	previous session): prevent start LLNearbyChat before start its container [ee3326baee44]

2012-08-22 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llconversationview.cpp, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-289 FIXED (Newly added conversation is not selected in	conversation list): added the "reverse" selecting - list item is selected when the corresponding floter gets focus. [460c8d1575ce]

2012-09-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llfloaterreg.cpp, indra/llui/llfloaterreg.h,	indra/newview/llnearbychat.cpp: CHUI-119 (Add Nearby chat to Conversations floater): addit. fix: use LLSD(LLUUID::null) instead LLSD::null as "default" floater's key [4202e227f8e4]

2012-09-14 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/skins/default/xui/en/floater_conversation_log.xml: CHUI-321 ADDITIONAL FIX (Indicate within the Call Log why there's	nothing in it)

- Corrected grammatical error [a8cca478bf86]

2012-09-13 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfolderviewitem.h, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp: merging in latest changes [ef27de295b5d]

* indra/llcommon/llfoldertype.h, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llviewerfoldertype.cpp: CHUI-283: Now upon the information icon and speaker icon do not overlap the username text. Instead the username text will be truncated with an ellipse to prevent the overlap. Also did a code cleanup. [5a72e03f3fe2]

* indra/newview/llimfloatercontainer.cpp: merging in latest changes [f0570e36118a]

* indra/llui/llfolderviewitem.cpp, indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/ xui/en/widgets/conversation_view_participant.xml: CHUI-283: Now the information icon only appears upon mousehover. Also the information/speaker icon are right justified. [b33f6d476a2d]

2012-09-12 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes [1e7e363651b4]

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h: CHUI-283: Now the speaker icon and information icon are functional. [72fad531c435]

2012-09-11 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp: merging in latest changes [13e68f41d64a]

2012-09-10 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h, indra/newview/skins/default/xui/ en/widgets/conversation_view_participant.xml: CHUI-283: Now displaying the speaker icon instead of the profile icon [32414cc0853c]

* indra/newview/llconversationview.h, indra/newview/skins/default/xui/ en/widgets/conversation_view_participant.xml: CHUI-283, fixed a build problem and also added a missing file. [612ea8bdef85]

* indra/llcommon/llfoldertype.h, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llviewerfoldertype.cpp: CHUI-283: Basic Implementation, just have hard coded avatar icon appearing and profile/info buttons visible. profile/info buttons do not have proper positioning or mouseclick events. [48a66a5c46c0]

2012-09-14 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-282 WIP Removed the hack added for CHUI-308 to resize the folder view in conversation list. Fixed some glitches after automated merge. [ddf4d303ce6a]

2012-09-13 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [c884e3fd898f]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/xui/en/panel_conversation_list_item.xml, indra/newview/skins/default/xui/en/widgets/conversation_view_session .xml: CHUI-282 WIP Fixed conversation list items selection. Fixed displaying session participants only when session item is open. [12c4ee4ef7f1]

2012-09-10 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llui/llfolderviewitem.h, indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llinventoryicon.h,	indra/newview/skins/default/xui/en/panel_conversation_list_item.xml: CHUI-282 WIP Modified conversation view item and IM floater container so that the folder view handles the positioning of items in conversations list. [818c6146a834]

2012-09-13 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llfloaterconversationpreview.cpp, indra/newview/lllogchat.cpp, indra/newview/lllogchat.h:	CHUI-334 FIXED (Date not shown in the chat log for current date	entries)

Before the "%Y/%m/%d" was always cutted from timestamp string for today's date. Now I added flag whether we should cut off timestamp or not. [de8a0cb2ef86]

2012-09-13 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-332 [Overlap of icons in chrome when collapsing and expanding conversation list]: force header resizing after show/hide minimize button [0b71eec9965a]

2012-09-13 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llappviewer.cpp, indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llfloaterconversationlog.cpp, indra/newview/llfloaterconversationlog.h,	indra/newview/skins/default/xui/en/floater_conversation_log.xml: CHUI-321 FIXED (Indicate within the Call Log why there's nothing in	it)

I. On "LogInstantMessages" variable set to false: 1. save call log to file 2. clear call log 3. show message: "Conversations are not being logged. To log conversations in the	future, select "Save IM logs in my computer" under Preferences >	Privacy." On "LogInstantMessages" set to true: 1. clear message 2. reload all saved call log entries

II. Refactored the way LLConversationLog reacts on	"LogInstantMessages" value change [d09ebec31586]

2012-09-12 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [90a51c638ece]

* indra/newview/llimfloatercontainer.cpp: CHUI-308 : Temp fix while waiting for a scroll container to be	implemented [976364624533]

2012-09-12 Paul ProductEngine  <pguslisty@productengine.com>

* indra/llui/llspinctrl.cpp, indra/llui/llspinctrl.h,	indra/newview/skins/default/xui/en/floater_conversation_preview.xml: CHUI-335 FIXED (Alpha text allowed in page spinner in chat history	viewer)

- Added XML parameter "allow_digits_only" to spinner control widget, which disables/enables ability to input alpha text. - Disabled ability to enter alpha text in page spinner in chat history viewer [6a0f30c0b67c]

2012-09-11 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llfloaterconversationpreview.cpp, indra/newview/skins/default/xui/en/floater_conversation_preview.xml: CHUI-336 FIXED (Remove Description label and field from Chat history	viewer)

- Removed lineeditor and text box from code and xml [65dcb79efa05]

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llconversationloglist.cpp, indra/newview/llconversationloglist.h,	indra/newview/llconversationloglistitem.cpp, indra/newview/llconversationloglistitem.h,	indra/newview/llfloaterconversationlog.cpp, indra/newview/llfloaterconversationlog.h:	CHUI-326 FIXED (One entry per conversation with a user in	conversation log timestamped with most recent utterance/activity.)

- Modified LLConversationLog to show only one entry per conversation with user. I.e. there can't be two conversations with the same session_id in LLConversationLog. - Got rid of processing voice sessions - Refactored creation of conversation in LLConversationLog - Refactored a little bit LLConversation and LLConversationLog: function names and made some functions private [ccfab6a00adc]

2012-09-10 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfloaterconversationpreview.cpp: Attempt to fix Linux build [17cac1fd56b3]

* Pull merge from richard/viewer-chui [16a3651264b5]

2012-09-09 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Pull merge richard/viewer-chui [eb3e1a790016]

* indra/newview/llimfloatercontainer.cpp: CHUI-285 : Complete. Fix participants repositioning. [48cf31ece8ad]

2012-09-07 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llparticipantlist.cpp: CHUI-285 : Implement sort, alphabetical only for the moment [bfe2781d9823]

2012-09-10 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-332 (Overlap of icons in chrome when collapsing and expanding	conversation list) changed expanded_min_dim of the right panel [249974012c74]

* indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-333 (Icons overlap in message panel when maximizing width of	conversation list): increaced expanded_min_dim for the message pane [b24efadcc554]

2012-09-07 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llnearbychathandler.cpp, indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationtiphandler.cpp, indra/newview/llviewerwindow.cpp: CHUI-323 FIXED (Local chat message panel out of position in	Conversation floater): Prevented too early creation LLNearbyChat [c861c3567f5f]

2012-09-10 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	CHUI-268 (Transfer the common functionality from LLNearbyChat and	LLIMFloater to LLIMConversation): moved appendMessage to base class [5740cf075325]

2012-09-07 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h:	CHUI-325 FIXED (Cap conversation log to 30 days, purge older data on	login)

- Remove conversations older than 30 days from call log [e2f190446606]

2012-09-05 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	CHUI-268 (Transfer the common functionality from LLNearbyChat and	LLIMFloater to LLIMConversation): moved focusLost, focusReceived and enable/disable of the call button to base class [f8ea86fc02ab]

2012-09-04 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-311 FIXED (Make conversation list panel size persist between	sessions): save current width in the setting_per_account.xml [201f50c74fb3]

2012-09-06 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [81372969351a]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llparticipantlist.cpp: CHUI-285 : Completed. Update the names of the participants. [f589ca3cd105]

2012-09-05 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp: CHUI-285 : Clear the needs refresh flag when refreshing, comment clean up. [90bac02fcbed]

2012-09-06 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llfloaterconversationpreview.cpp, indra/newview/llfloaterconversationpreview.h,	indra/newview/skins/default/xui/en/floater_conversation_preview.xml: CHUI-318 FIXED (User cannot navigate forward in chat history viewer	once the More History option is selected.)

- Added spinner so that user could select desired history page. Also displaying total count of pages. [ed66a79e256d]

* indra/newview/app_settings/settings.xml: CHUI-324 FIXED (No sort order field set by default in conversation	log)

- Corrected value in settings XML [db6a0cdd1247]

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h:	CHUI-320 FIXED (Inconsistent name formatting in conversation log	depending if user started conversation or not)

- On P2P session started, before creating entry of conversation log, requesting avatar name in form of Display Name (user.name) [28a79114aa43]

* indra/newview/llchathistory.cpp, indra/newview/llchathistory.h,	indra/newview/skins/default/xui/en/floater_conversation_preview.xml: CHUI-319 FIXED ("User has said something new" text shown when	navigating chat history with More History button)

- Added flag to chat history whether to show notification about unread messages or not [e9281ff89d69]

2012-08-31 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llfloater.cpp, indra/llui/llfloater.h,	indra/newview/llagent.cpp, indra/newview/llchatitemscontainerctrl.cpp, indra/newview/llfloatertranslationsettings.cpp, indra/newview/llgesturemgr.cpp, indra/newview/llimconversation.cpp, indra/newview/llimview.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h, indra/newview/llnearbychathandler.cpp, indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationtiphandler.cpp, indra/newview/llviewergesture.cpp, indra/newview/llviewerkeyboard.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp: CHUI-315 (Nearby chat messages do not appear in conversation	floater): cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it. [382497c8adcf]

2012-09-04 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: Pull merge from richard/viewer-chui [87052cc6c737]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp: CHUI-285 : Create participant widgets in the conversation list [1b12321cd8f6]

2012-09-04 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llinventorybridge.cpp, indra/newview/llinventorymodel.cpp: CHUI-303: Problem was that the prior solution only updated (using	dirtyFilter) the inventory window that the paste occurred in. Resolution: Now each inventory window calls dirtyFilter, which then determines visibility of the pasted item. [09dd53ee7984]

* merging in latest changes [ab0f9bd04997]

* indra/newview/llfloateravatarpicker.cpp: CHUI-305: Now searching in the resident picker works. Problem: The resident picker search results were being sent to the old global resident picker. Now resident pickers are non-global and coupled to their parent floater. [c615d3c1afef]

2012-09-03 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llappviewer.cpp, indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h:	CHUI-314 FIXED (Update Save IM logs on my computer setting to also	control populatoin of conversation log)

- Now LLConversationLog is optionally listener of IMSession, dependently on "LogInstantMessages" per account setting, saving of call log to file also depends on this setting. Which means that with the Save IM logs on my computer disabled: IM logs for the user will not be saved to their computer and conversations will not be logged to the conversation log. [e03d108b00bd]

* indra/newview/skins/default/xui/en/panel_blocked_list_item.xml, indr a/newview/skins/default/xui/en/panel_conversation_log_list_item.xml: CHUI-307 FIXED (LLInitParam::Parser::parserWarnings in log when	adding conversations or deleting entries from conversation log )

- removed redundant incorrect attributes [72a90c6e84e7]

2012-08-31 Gilbert Gonzales  <username@lindenlab.com>

* merging in latest changes [a75ca55109aa]

* indra/newview/llimfloatercontainer.cpp: merging in latest changes [c938abca9d3e]

2012-08-30 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llfloateravatarpicker.cpp, indra/newview/llfloaterregioninfo.cpp: CHUI-305: Now the Region/Estate floater displays the frustum shadow when opening the Resident Picker. [067c5d780944]

* indra/newview/app_settings/settings.xml, indra/newview/llavataractions.cpp, indra/newview/llavataractions.h,	indra/newview/llfloateravatarpicker.cpp, indra/newview/llfloateravatarpicker.h,	indra/newview/llfloatercolorpicker.cpp, indra/newview/llfloatercolorpicker.h,	indra/newview/llfloatergodtools.cpp, indra/newview/llfloaterland.cpp, indra/newview/llfloaterreporter.cpp, indra/newview/llfloatersellland.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llpanelblockedlist.cpp, indra/newview/llpanelgroupinvite.cpp, indra/newview/llpanelpeople.cpp: CHUI-305: Minor changes after code review. Using templated findChild instead of getChildView. Also using settings.xml to store common custom variables. [979eb4bb78ea]

2012-08-29 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: merging in latest changes [f1bd008d7feb]

* indra/llui/llfloater.cpp, indra/newview/llavataractions.cpp, indra/newview/llavataractions.h,	indra/newview/llfloateravatarpicker.cpp, indra/newview/llfloateravatarpicker.h,	indra/newview/llfloatercolorpicker.cpp, indra/newview/llfloatergodtools.cpp, indra/newview/llfloaterland.cpp, indra/newview/llfloaterregioninfo.cpp, indra/newview/llfloaterreporter.cpp, indra/newview/llfloatersellland.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llpanelblockedlist.cpp, indra/newview/llpanelblockedlist.h,	indra/newview/llpanelgroupinvite.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/llpanelpeople.cpp, indra/newview/llpanelpeople.h,	indra/newview/llsidepanelinventory.cpp: CHUI-305: Problem: The 'resident picker' had multiple parents and due to the design of the resident picker it can have only one parent. Having multiple parents caused both parents to fight for depth ordering...which caused the flickering. Resolution: Now multiple 'resident pickers' can exist and they are coupled to the floater that spawned then. Meaning that when the parent floater closes, the 'resident picker' floater will also close. In addition, a shadow frustum eminates from the button that opened the 'resident picker'. [ca9268891757]

2012-08-31 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llconversationloglist.cpp, indra/newview/llconversationloglist.h,	indra/newview/llconversationloglistitem.h,	indra/newview/llvoicechannel.cpp, indra/newview/llvoicechannel.h:	CHUI-298 FIXED (Conversation started as an IM and then goes to voice	call does not show as call in conversation log)

- Show voice icon when call is started - Added flag LLConversation::mIsConversationPast which means that this conversation is finished and any of its data can't be changed. I.e. it cannot be reused. - When session removed (i.e. finished) corresponding conversation is marked as Past conversation. I.e. mIsConversationPast is true. - Added changed(const LLUUID& session_id, U32 mask) method to LLConversationLog to notify particular conversation. This is used in	LLConversationLogList to update its particular item and not to rebuild the whole list. [2aa8b9efa34a]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/skins/default/xui/en/menu_participant_view.xml: CHUI-154 FIXED (Add link to chat preferences from Conversation	floater)

- Added link to chat preferences from Conversation floater [ce9732aaf348]

* indra/newview/llconversationloglist.cpp, indra/newview/llfloaterconversationlog.cpp, indra/newview/llfloaterconversationpreview.cpp, indra/newview/llfloaterconversationpreview.h,	indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml, indra/newview/skins/default/xui/en/menu_conversation_log_view.xml: CHUI-157 FIXED (Implement menu bar for conversation floater)

- Added View Nearby chat history option - Also replaced menu item "Add Friend / Remove" with two separate menus: Add Friend and Remove Friend. So if user is a Friend the Remove Friend option would be shown there. If the user is not a	friend, the Add Friend option would be shown. [c642f7be7687]

2012-08-30 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderviewmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llparticipantlist.cpp: CHUI-285 : LLIMFloaterContainer is now using LLParticipantList fully [24add129174c]

2012-08-29 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp: CHUI-285 : WIP : Get the conversation floater to use the same LLParticipantList as the IM and call dialog [bb68d158d183]

* Pull merge from richard/viewer-chui [561acf907342]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h:	CHUI-280 : Add print out debug methods [84f9e328fcc7]

2012-08-28 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llparticipantlist.cpp: CHUI-280 : Implement all LLConversationModel updates in LLParticipantList. Allow mAvatarList to be NULL. [c51ddcbb5d1b]

* indra/llui/llfolderviewmodel.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llparticipantlist.cpp: CHUI-280 : WIP : Implement update of LLConversationModel in	LLParticipantList [120dc60a4fa8]

2012-08-28 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/lltoastimpanel.cpp, indra/newview/lltoastimpanel.h:	CHUI-287 FIX IM toast panel is closed upon mouse up and doesn't pass the mouse click that activates "click to walk". [f2f5d6f29c2a]

2012-08-28 William Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llfloaterconversationpreview.cpp: BUILDFIX: Correcting a linux build error. [4d8c42ec0991]

2012-08-28 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/app_settings/settings.xml, indra/newview/llfloaterconversationpreview.cpp, indra/newview/llfloaterconversationpreview.h,	indra/newview/llimview.cpp, indra/newview/lllogchat.cpp, indra/newview/lllogchat.h, indra/newview/llnearbychat.cpp, indra/newview/skins/default/xui/en/floater_conversation_preview.xml: CHUI-275 FIXED (Chat history viewer does not show entire user.txt IM	log file)

- Renamed LLLogChat::loadAllHistory to LLLogChat::loadChatHistory because it doesn't actually loads all history. Also added parameter to the function which is a flag whether to load all file's content or not. - Implemented displaying history by pages (as was decided on meeting	page): Added showHistory method to the LLFloaterConversationPreview which shows the chat history page by	page starting from the last conversation (or may say starting from	the last page). One page contains 100 entries. Added "More	history..." button to display next page of history. [fd9620d8e9d1]

2012-08-27 William Todd Stinson  <stinson@lindenlab.com>

* indra/llcommon/llmemory.h, indra/llmath/tests/alignment_test.cpp: Skipping the realloc alignment test on Linux as the ll_aligned_malloc_16 function is not implemented to ensure alignment on Linux. [ed0c75e34b5d]

2012-08-27 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimconversation.cpp: Merge pull from richard/viewer-chui [8526c4d09ab8]

2012-08-24 Merov Linden  <merov@lindenlab.com>

* indra/newview/llcallfloater.cpp, indra/newview/llcallfloater.h,	indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/llparticipantlist.cpp, indra/newview/llparticipantlist.h:	CHUI-280 : Make LLParticipantList derives from LLConversationItemSession [0791c24928ef]

2012-08-27 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp: removed debug messages [0f166bcdc115]

2012-08-22 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llagent.cpp, indra/newview/llchatitemscontainerctrl.cpp, indra/newview/llfirstuse.cpp, indra/newview/llfloatertranslationsettings.cpp, indra/newview/llgesturemgr.cpp, indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimview.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h,	indra/newview/llnearbychathandler.cpp, indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationtiphandler.cpp, indra/newview/llstartup.cpp, indra/newview/llviewerfloaterreg.cpp, indra/newview/llviewergesture.cpp, indra/newview/llviewerkeyboard.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp, indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/de/floater_chat_bar.xml, indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/en/menu_viewer.xml, indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml, indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/es/floater_chat_bar.xml, indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/fr/floater_chat_bar.xml, indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/it/floater_chat_bar.xml, indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/ja/floater_chat_bar.xml, indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/pt/floater_chat_bar.xml, indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/ru/floater_chat_bar.xml, indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/tr/floater_chat_bar.xml, indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml, indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml: CHUI_310 make NearbyChat a singletone [92e9162d5915]

2012-08-24 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llinventorybridge.cpp: merging in latest changes [b8675d592129]

* indra/newview/llinventorybridge.cpp: kicking off another build (whitespace change) [1b6872863a87]

2012-08-23 Gilbert Gonzales  <gilbert@lindenlab.com>

* merging in latest changes. [a9bcc10a735c]

* indra/newview/llinventorybridge.cpp: CHUI-303: Problem: When pasting the item, the item's filtering flag was not updated. The filtering flag determines visibility. Resolution: Upon pasting the item to the folder from the clipboard, update the filtering flag so that visibility can properly be determined. [218b29f1be6a]

2012-08-23 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [9fd87314f49c]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp: CHUI-98 : Defining the various llconversation sub classes in their respective file [a6da1b051e5a]

* indra/newview/llimfloatercontainer.cpp: CHUI-282 : Use views for UI manipulation, not models [8e6cf1d9166e]

2012-08-23 Todd Stinson  <stinson@lindenlab.com>

* .hgtags, indra/llui/llfolderview.cpp, indra/llui/llfolderview.h,	indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/llui/tests/llurlentry_stub.cpp, indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llappviewer.cpp, indra/newview/llflexibleobject.cpp, indra/newview/llfloatertools.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llstartup.cpp, indra/newview/llviewerobject.cpp, indra/newview/llviewerobject.h,	indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml, indra/newview/skins/default/xui/en/notifications.xml: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [3f1c0b51042a]

2012-08-23 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: Merge pull from richard/viewer-chui [950a308cdaf6]

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp: CHUI-282 : WIP : Further separate view from model for llconversation items [6cd903fcf981]

2012-08-22 Merov Linden  <merov@lindenlab.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h:	CHUI-282 : WIP, Clean up dependencies [75f0ce08379f]

* indra/newview/CMakeLists.txt, indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llconversationview.cpp, indra/newview/llconversationview.h,	indra/newview/llimfloatercontainer.cpp: CHUI-282 : WIP : Isolated llconversationview classes and suppressed the dependency of model to widgets [278e27eee9d6]

2012-08-23 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llconversationloglist.cpp, indra/newview/llconversationloglistitem.cpp: CHUI-306 FIXED (Selecting IM option for Group in conversation log	does not start an IM if you did not initiate the conversation)

- To start group call or group chat, group_id should be passed as an argument to LLGrupActions, not participant_id. [cb18a2a61739]

* indra/newview/llimfloater.cpp: CHUI-296 FIXED (Unread IM messages icon not showing in conversation	log)

- Sometimes IM floater with offline unread messages is visible but not in visible chain and the flag of offline unread messages is erroneously reset. So made condition of whether floater is visible more strict. [e838047b608f]

2012-08-22 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: code style fix [e61afa068900]

2012-08-21 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llnotificationscripthandler.cpp, indra/newview/skins/default/xui/en/notifications.xml: CHUI-293 CHUI-294 FIXED displaying Group Invite and Transfer Object as notifications, instead of displaying as messages from an object. Restored the exception in handling "LoadWebPage", "ScriptDialog" and "ScriptDialogGroup" notifications, that caused only those notifications to be shown as messages from an object. [219748539b2b]

2012-08-21 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llconversationloglistitem.cpp, indra/newview/llconversationloglistitem.h:	CHUI-297 FIXED (Double clicking line item in conversation log does	not start IM with User)

- Added callback on double click which initiates IM session with selected conversation log list item [f0c0b3581f54]

* indra/newview/llconversationlog.cpp: CHUI-300 FIXED (Simplify conversation log name saved to user	settings?)

- Changed file name agentID#.call_log to conversation.log [96b7dda8125b]

2012-08-21 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [53630f4db149]

2012-08-20 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/notifications.xml: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [364c55d1d2e1]

2012-08-16 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-120 WIP Notifications about added chat participants should be sent to the conference when those participants actually join. - Removed notifying existing P2P participants about ad hoc conference staring in a new window. Now the notifications should arrive in that new window. - Fixed "Cancel" button which had no effect in adding P2P participants notification. [6d5f0712cdbc]

2012-08-10 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-120 WIP Different notifications about single and multiple chat participants invited. The notification about starting a new conversation now applies only to P2P chat. Some code refactoring and clean up. [dc39fc496ddc]

2012-08-09 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/notifications.xml: CHUI-120 WIP Added notifications about newly invited chat participants. [c63c5ffb261d]

2012-08-16 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloateravatarpicker.cpp, indra/newview/llfloateravatarpicker.h,	indra/newview/llimfloatercontainer.cpp: CHUI-299 (User can start IM session with themselves) FIXED: agent was excluded from the search results [91bc61eae552]

2012-08-17 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloater.cpp: CHUI-286 ADD. FIX (Conversations floater opened by default when a	new IM session is started (no IM toast shown)): repair toast's	system - suppress toasts only if corresponding floater is visible [83d3838c84ad]

2012-08-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-302 FIXED (User can resize conversation list too small with	message panel collapsed) set floater's resize limits from a left panel's limits [7cb207a6c437]

* indra/newview/llimconversation.cpp: CHUI-290 FIXED (User cannot collapse names in ad hoc conversation	when changed from p2p to ad hoc in torn off state): detect new collapse button state after rebuild of a participant list [90e44583fb1b]

2012-08-20 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge in latest changes [1152f8ecb1b8]

* indra/newview/CMakeLists.txt, indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanellandmarks.cpp, indra/newview/llplacesfolderview.cpp, indra/newview/llplacesfolderview.h,	indra/newview/llplacesinventorypanel.cpp, indra/newview/llplacesinventorypanel.h:	CHUI-295: Problem: The places panel implemention was incomplete and trying to make use of a class that was not fully implemented (placesfolderview). Resoltuion: Upon creation of the places panel, placesfolderview is created which contains the proper overloaded functions to show the correct menu when right clicking. [ecaffde92288]

2012-08-17 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: Remove typo [430075238db4]

2012-08-16 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventorypanel.cpp, indra/newview/llpanelmarketplaceinbox.cpp, indra/newview/llpanelmarketplaceinboxinventory.cpp, indra/newview/llpanelmarketplaceinboxinventory.h:	CHUI-269: Problem: When an item was purchased and delivered into the 'Received Items' panel, the badge icon and new item count would not show. This was due to the creation date of the folders not being set when a new item was added. Resolution: Now when an item is added into the 'Received Items' panel, the folder hierachy is updated, triggering the badge icon and new item count to show. [29b34556d315]

2012-08-16 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-278, CHUI-288 FIXED Panels in conversations floater does not fully collapse: changed parameter min_width -> expanded_min_dim [05f531ac3517]

2012-08-15 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llnearbychat.cpp: CHUI-286 (Conversations floater opened by default when a new IM	session is started (no IM toast shown): now floater silently adds	itself to the container	[a6cfda060af8]

2012-08-15 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/skins/default/textures/icons/Conv_log_inbox.png, indra/newview/skins/default/textures/textures.xml, indra/newview/ski ns/default/xui/en/panel_conversation_log_list_item.xml: CHUI-235 FIXED (Create icons for new conversation log list items)

- Replaced old icons with new ones [db20d4f1d460]

* indra/newview/llconversationlog.cpp: CHUI-257 FIXED (Using clear cache option in preferences clears call	log also)

- Changed location where call log file is saved. Now it's saved with other user settings files under each avatar's directory in the user settings directory. [68cbdd1509fd]

2012-08-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-171, CHUI-272 conversation is added as docked in conversation floater when session started (without click on an conv. list's item) [13a6dbde71bb]

2012-08-10 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfolderviewitem.cpp, indra/newview/llinventorybridge.cpp: CHUI-273: Problem was that after renaming the item, the item was not triggering a sort. Resolution: Once the name of the item is set, trigger a sorting of the parent. [483aa70dea97]

2012-08-10 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: fixed merge issue. Done. [bd36a07a15f3]

* indra/newview/llimfloatercontainer.cpp: fix incorrect merge [5130bbfeeee2]

* indra/newview/llimconversation.h:	build fix [9308b4e239ab]

2012-08-09 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llnearbychat.cpp, indra/newview/llsyswellwindow.h,	indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/strings.xml: CHUI-171 WIP (Conversation not automatically readded to conversation	window listing when open) - removal of the dependence between items of the conversations list and conversation's floaters. [bc3f3b6b907b]

2012-08-09 Todd Stinson  <stinson@lindenlab.com>

* indra/llcommon/llinitparam.h, indra/llcommon/llregistry.h,	indra/llui/llfloater.cpp, indra/llui/lltextbase.cpp, indra/llui/lltooltip.cpp, indra/llui/lluictrlfactory.cpp, indra/llui/lluictrlfactory.h, indra/llui/llxuiparser.cpp, indra/llui/llxuiparser.h, indra/newview/app_settings/settings.xml, indra/newview/llavatarlistitem.cpp, indra/newview/llinventoryfunctions.cpp, indra/newview/llinventoryfunctions.h,	indra/newview/llinventorypanel.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llspatialpartition.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h, indra/newview/llvopartgroup.cpp, indra/newview/pipeline.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/panel_preferences_chat.xml, indra/newview/skins/default/xui/en/strings.xml: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer- development. [c5c69b65b797]

* indra/newview/llfloaterpreference.cpp: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [01cc385ccda6]

* BuildParams, indra/cmake/LLConvexDecomposition.cmake, indra/llui/llfolderview.cpp, indra/llui/llnotifications.cpp, indra/llui/llnotificationtemplate.h, indra/llui/llview.cpp, indra/newview/CMakeLists.txt, indra/newview/app_settings/commands.xml, indra/newview/app_settings/settings.xml, indra/newview/llagent.cpp, indra/newview/llappviewer.cpp, indra/newview/llfloaterpreference.cpp, indra/newview/llfloatertools.cpp, indra/newview/llinventorymodel.cpp, indra/newview/llspatialpartition.cpp, indra/newview/llstartup.cpp, indra/newview/llviewerfloaterreg.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h, indra/newview/llvopartgroup.cpp, indra/newview/pipeline.cpp, indra/newview/skins/default/colors.xml, indra/newview/skins/default/textures/textures.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/strings.xml: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. [f29c7377c3ac]

2012-08-08 Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [ff1c75d6b9da]

* indra/llui/llfolderview.cpp: CHUI-272: BUGFIX Correcting the inventory filtering so that a large number of items in the inventory are completely processed before the filter's modified flag is cleared. [37cfb9f26012]

2012-08-06 Merov Linden  <merov@lindenlab.com>

* indra/newview/CMakeLists.txt, indra/newview/llconversationmodel.cpp, indra/newview/llconversationmodel.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-98 : Isolate LLConversationItem and LLConversationViewModel in	their own file [a22a1dfb94dc]

2012-08-06 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/llinventorypanel.cpp: Linux compiliation fix, needed to create DirtyFilterFunctor outside of function parameter so that it can be legally passed as a	reference. [2958ff6dd376]

* indra/newview/skins/default/xui/en/panel_landmarks.xml: CHUI-276: Problem was that the flag to use ellipses was not turned on for the folderview's inside the Places folder. Resolution was to	turn on the flag inside the panel_landmarks.xml file for each folder displayed (favorites bar, my landmarks and etc.) [ffa37c40d551]

2012-08-03 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-241 (Add drag handle in UI to resize width of conversations	list): implemented drag handle via predefined params of layout panels [9832dcbc5e92]

2012-08-03 Richard Linden  <Richard Linden>

* indra/llcommon/llinitparam.cpp, indra/llcommon/llinitparam.h:	CHUI-270 FIX Progress spinner not visible in merchant outbox [d5c6c40d35d0]

* indra/newview/llinventorypanel.cpp: CHUI-273 FIX Inventory filtering changes not showing when changes are selected [495fd22a5e68]

* Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [d6e19962efa6]

* indra/llui/llfolderviewitem.h, indra/llui/llfolderviewmodel.cpp, indra/llui/llfolderviewmodel.h, indra/newview/llinventorypanel.cpp: CHUI-271 FIX Items that are cut and then removed from the clipboard without paste do not show in Trash until relog [27eb51e52f30]

2012-08-03 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui. [21dad7ee4737]

* indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h: CHUI-263 : Fix crash on exit. LLSingleton like LLConversationLog cannot be an LLFriendObserver at the same time. [58dfc3a540f6]

2012-08-03 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/newview/skins/default/xui/en/panel_landmarks.xml: CHUI-265: Problem was that the each accordian tab was using the llinvetorypanel object to display contents. The llinventorypanel was designed by default to use a scrollbar horizontally/vertically, just like in the inventory floater. Resolution: Now set a flag to hide the scrollbar for each accordian tab. [bdadcc7bafaa]

2012-08-02 Richard Linden  <Richard Linden>

* indra/llui/llfolderview.cpp, indra/newview/llinventorypanel.cpp: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [b128badd35b9]

* indra/llui/llfolderview.cpp, indra/llui/llfolderview.h,	indra/newview/llinventorypanel.cpp: CHUI-223 FIX Selecting to cut an inventory item causes all open inventory windows to refresh [80e85958a428]

2012-08-02 Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llhudobject.h, indra/newview/llvoavatar.cpp, indra/newview/llvoicevisualizer.cpp, indra/newview/llvoicevisualizer.h:	Re-enabling the voice-dot until I have more time to invest in the new CHUI version. [a8a03eb7facd]

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [da54e14242c6]

* indra/newview/llinventorypanel.cpp, indra/newview/llvopartgroup.cpp: CHUI-262: Reordering the steps to remove a view item and view item model during the deletion process to avoid a crash. [4f55e1166f11]

2012-08-02 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llinventory/llinventory.cpp: CHUI-228 FIX Inventory object creation date initialized with 0 to avoid some folders reporting wrong creation date. [1a580d69bdbc]

2012-08-02 Gilbert Gonzales  <gilbert@lindenlab.com>

* merge changes [0a30d469c3c8]

* indra/llui/llfolderview.cpp: merging of latest code [17589673f057]

2012-08-01 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfolderview.cpp, indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llpanelmarketplaceoutboxinventory.h, indra/newview/ski ns/default/xui/en/widgets/outbox_folder_view_folder.xml, indra/newvi ew/skins/default/xui/en/widgets/outbox_inventory_panel.xml: merge of latest changes [187bbd38631f]

* indra/llui/llfolderview.cpp: CHUI-214: Scrolling to offscreen content now works. Problem was due to the icon height/width not being computed before scrolling to the new item. There was also a problem with the computation that determines if the item being scrolled to is within the visible region. [96e76673ae1a]

2012-08-02 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llfloater.cpp, indra/llui/llfloater.h,	indra/llui/llmultifloater.cpp, indra/llui/llmultifloater.h,	indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llnearbychat.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-230, CHUI-232, CHUI-261 Forced resize of a conversation's	floater in the IM-container; support of the rectControls for IM- conversations; fixed LLFloater and LLMultiFloater for the correct hosting of floaters with mSaveRect [5910dad2f300]

2012-08-01 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/llui/llfloater.h, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	CHUI-268 (Transfer the common functionality from LLNearbyChat and	LLIMFloater to LLIMConversation): Remove duplication of	functionality from LLNearbyChat; transfer mChatHistory, mInputEditor and some its settings and callbacks to the base class. [8deba46ed116]

2012-08-01 Richard Linden  <Richard Linden>

* indra/llui/llfolderview.cpp, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h, indra/newview/llinventorypanel.cpp: CHUI-223 WIP Selecting to cut an inventory item causes all open inventory windows to refresh avoid moving selection when cutting [6699a50e6499]

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewmodel.h,	indra/llui/lltooltip.cpp, indra/newview/llfolderviewmodelinventory.cpp, indra/newview/llfolderviewmodelinventory.h,	indra/newview/llimfloatercontainer.h:	CHUI-223 WIP Selecting to cut an inventory item causes all open inventory windows to refresh improved filtering behavior that should result in less flashes of emptiness [7f2bbb9a3eec]

* indra/llui/llfolderviewitem.cpp: CHUI-254 FIX Fix Inventory filter and item draw to highlight matching substrings in inventory made background highlighting sit behind label, so as not to obscure neighboring characters in label [8b19214823ba]

* indra/llui/llfolderviewitem.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	build fix [ba26a702ad04]

* indra/newview/skins/default/xui/en/panel_inbox_inventory.xml: CHUI-218 FIX (Items and Item count is not show in Received Items	folder in Inventory) forgot to check in	[707a53db272b]

* indra/llui/llfolderviewmodel.h:	build fix attempt [dcd82537aa2b]

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/llui/llfolderviewmodel.h,	indra/newview/llfolderviewmodelinventory.cpp, indra/newview/llfolderviewmodelinventory.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llinventoryfilter.h:	merge with ssh://hg.lindenlab.com/richard/viewer-chui [39f1738c49b8]

* indra/llui/llfolderview.cpp, indra/llui/llfolderview.h,	indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/llui/llfolderviewmodel.cpp, indra/llui/llfolderviewmodel.h,	indra/newview/llfloateroutbox.cpp, indra/newview/llfolderviewmodelinventory.cpp, indra/newview/llfolderviewmodelinventory.h,	indra/newview/llinventorybridge.cpp, indra/newview/llinventoryfilter.cpp, indra/newview/llinventoryfilter.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanellandmarks.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelmarketplaceinbox.cpp, indra/newview/llpanelmarketplaceinboxinventory.cpp, indra/newview/llpanelmarketplaceinboxinventory.h,	indra/newview/llpanelobjectinventory.cpp, indra/newview/lltexturectrl.cpp: CHUI-267 FIX Full inventory listing not always shown for test account changed LLFolderViewModelInterface::getFilter to return a	reference, since it is never NULL removed sort order from filter, which was causing unneeded filtering [691972ff710b]

2012-07-31 Merov Linden  <merov@lindenlab.com>

* Pull from richard/viewer-chui [558e9d388a54]

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/llui/llfolderviewmodel.h,	indra/newview/llfolderviewmodelinventory.cpp, indra/newview/llfolderviewmodelinventory.h,	indra/newview/llimfloatercontainer.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llinventoryfilter.h:	CHUI-254 : Fix Inventory filter and item draw to highlight matching substrings in inventory [d97d3d59d77b]

2012-07-31 Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llvoavatar.cpp: CHUI-259: Resovling an issue introduced during the recent merge that incorrectly altered the conditional scope of when nametag text segments were created. [db12f757992d]

* indra/newview/skins/default/xui/en/notifications.xml: CHUI-258: Ensuring that the teleport lure requests are logged to IM and not to nearby chat. [0cce91d37e8b]

2012-07-30 William Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui. [be2ab1da7047]

2012-07-30 Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llpanelmarketplaceoutboxinventory.h, indra/newview/ski ns/default/xui/en/widgets/outbox_folder_view_folder.xml, indra/newvi ew/skins/default/xui/en/widgets/outbox_inventory_panel.xml: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. [b2882b8196c4]

* indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h,	indra/newview/llnotificationtiphandler.cpp, indra/newview/skins/default/xui/en/notifications.xml: CHUI-258: Adding a method to better whether nearby chat is visible or not. [9de645849308]

2012-07-30 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-229 : Fix disappearance of nearby chat list item by forcing all list widgets to be visible. [905a26955a00]

2012-07-30 Richard Linden  <Richard Linden>

* indra/llui/llfolderviewitem.cpp, indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llpanelmarketplaceoutboxinventory.h, indra/newview/ski ns/default/xui/en/widgets/outbox_folder_view_folder.xml, indra/newvi ew/skins/default/xui/en/widgets/outbox_inventory_panel.xml: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [e07acd472742]

* indra/llui/llfolderview.h:	moved method from places inventory up into common llfolderview [a4a479ae57a1]

* indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h,	indra/llui/lluictrlfactory.cpp, indra/llui/lluictrlfactory.h,	indra/newview/CMakeLists.txt, indra/newview/llagentwearablesfetch.cpp, indra/newview/llappearancemgr.cpp, indra/newview/llfloateroutbox.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventorymodel.cpp, indra/newview/llinventorymodel.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanellandmarks.cpp, indra/newview/llpanelmarketplaceinboxinventory.cpp, indra/newview/llpanelmarketplaceinboxinventory.h,	indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llpanelmarketplaceoutboxinventory.h,	indra/newview/llplacesinventorybridge.cpp, indra/newview/llplacesinventorybridge.h,	indra/newview/llplacesinventorypanel.cpp, indra/newview/llplacesinventorypanel.h,	indra/newview/llsidepanelinventory.cpp, indra/newview/lltooldraganddrop.cpp, indra/newview/pipeline.cpp, indra/newview/skins/default/xui/en/panel_inbox_inventory.xml, indra/newview/skins/default/xui/en/panel_landmarks.xml, indra/newview/skins/default/xui/en/panel_outbox_inventory.xml, indra /newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml, ind ra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xm	l, indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel .xml: CHUI-217 FIX Items are not visible in Merchant Outbox cleaned up a	lot custom code for folder view item creation in inbox and outbox proper initialization of views from inventory panel starting folder [aa60df2b9c26]

2012-07-30 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfolderviewitem.cpp: CHUI-213: When a new folder is added to inventory, its parent is assigned before calling dirtyFilter. This allows dirtyFilter to propogate the dirty flag up. [e6eeb978ff38]

2012-07-30 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llui/llfolderviewitem.cpp: CHUI-244 FIX for propagating the dirty filter flag to the folder view item's parent. The filter dirty flag is set after a new child item is added to ensure that this item already has a parent and the dirty flag can be bubbled up. [3e39389137aa]

2012-07-27 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/skins/default/xui/en/strings.xml: Micro fix for string.xml [5be1831b0a8c]

2012-07-27 Todd Stinson  <stinson@lindenlab.com>

* indra/llcommon/llinitparam.cpp, indra/llcommon/llinitparam.h,	indra/llcommon/llsdparam.cpp, indra/llui/tests/llurlentry_stub.cpp, indra/llui/tests/llurlmatch_test.cpp, indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llappviewer.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimview.cpp, indra/newview/llstartup.cpp, indra/newview/llviewerfloaterreg.cpp, indra/newview/llviewermessage.cpp, indra/newview/llvoicevivox.cpp: Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [2c0131cefc9c]

* indra/llui/llfolderviewitem.cpp, indra/newview/llimfloater.cpp: Updating comments for merge conflicts after reviewing with Richard. [70d3fc7294ee]

* BuildParams, indra/llcommon/llinitparam.cpp, indra/llcommon/llinitparam.h, indra/llcommon/llinstancetracker.h,	indra/llcommon/llprocesslauncher.cpp, indra/llcommon/llprocesslauncher.h, indra/llcommon/llregistry.h,	indra/llcommon/llsdparam.cpp, indra/llcommon/tests/setpython.py, indra/llui/CMakeLists.txt, indra/llui/llfloater.cpp, indra/llui/llfolderview.cpp, indra/llui/llfolderviewitem.cpp, indra/llui/llmenugl.cpp, indra/llui/llmenugl.h,	indra/llui/llmultifloater.cpp, indra/llui/llnotifications.cpp, indra/llui/llnotifications.h, indra/llui/llnotificationtemplate.h,	indra/llui/llsdparam.cpp, indra/llui/llsdparam.h,	indra/llui/lltextbase.cpp, indra/llui/lltextbase.h,	indra/llui/lltexteditor.cpp, indra/llui/llui.cpp, indra/llui/llxuiparser.cpp, indra/llui/llxuiparser.h,	indra/llui/tests/llurlentry_stub.cpp, indra/llui/tests/llurlmatch_test.cpp, indra/llxuixml/CMakeLists.txt, indra/llxuixml/llinitparam.cpp, indra/llxuixml/llinitparam.h,	indra/llxuixml/llregistry.h, indra/llxuixml/lltrans.cpp, indra/llxuixml/lltrans.h, indra/llxuixml/lluicolor.cpp, indra/llxuixml/lluicolor.h, indra/llxuixml/llxuiparser.cpp, indra/llxuixml/llxuiparser.h, indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llagent.cpp, indra/newview/llavataractions.cpp, indra/newview/llchathistory.cpp, indra/newview/llfavoritesbar.cpp, indra/newview/llfavoritesbar.h,	indra/newview/llfloatermodelwizard.cpp, indra/newview/llfloatermodelwizard.h,	indra/newview/llfloaterpreference.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimview.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventoryfilter.cpp, indra/newview/llinventorymodel.cpp, indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationscripthandler.cpp, indra/newview/llspatialpartition.cpp, indra/newview/llstartup.cpp, indra/newview/lltexturectrl.cpp, indra/newview/lltoastnotifypanel.cpp, indra/newview/lltoastpanel.cpp, indra/newview/lltoastscriptquestion.cpp, indra/newview/lltooldraganddrop.cpp, indra/newview/lltooldraganddrop.h,	indra/newview/llviewerfloaterreg.cpp, indra/newview/llviewerinventory.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h,	indra/newview/pipeline.cpp, indra/newview/skins/default/textures/textures.xml, indra/newview/skins/default/xui/da/floater_model_wizard.xml, indra/newview/skins/default/xui/de/floater_model_wizard.xml, indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/floater_model_wizard.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/panel_preferences_chat.xml, indra/newview/skins/default/xui/en/strings.xml, indra/newview/skins/default/xui/es/floater_model_wizard.xml, indra/newview/skins/default/xui/fr/floater_model_wizard.xml, indra/newview/skins/default/xui/it/floater_model_wizard.xml, indra/newview/skins/default/xui/ja/floater_model_wizard.xml, indra/newview/skins/default/xui/pt/floater_model_wizard.xml, indra/newview/skins/default/xui/ru/floater_model_wizard.xml, indra/newview/skins/default/xui/tr/floater_model_wizard.xml: Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. [513031c96884]

2012-07-27 Richard Linden  <Richard Linden>

* indra/llui/tests/llurlentry_stub.cpp, indra/llui/tests/llurlmatch_test.cpp: build fix [b1167c8ad2fe]

* Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [a560b88b4ef7]

* indra/newview/llconversationlog.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llpanelobjectinventory.cpp: CHUI-256 FIX Invalid param warnings in llfolderview when adding and deleting items from object inventory [4b7d8050d331]

2012-07-27 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llfloaterconversationlog.cpp, indra/newview/llfloaterconversationlog.h: Fixed line endings in files added in CHUI-151. [eb0c147fe5a1]

2012-07-27 Richard Linden  <Richard Linden>

* indra/newview/skins/default/xui/en/floater_conversation_log.xml: fixed line endings [d7d187074d40]

* indra/llxuixml/llinitparam.h:	Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [0ab4259f8894]

* indra/llui/llsdparam.cpp, indra/llxuixml/llinitparam.cpp, indra/llxuixml/llinitparam.h:	CHUI-253 FIX Not able to view the contents of a Buy Contents object for sale [bf73d7dc0eb3]

2012-07-27 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llappviewer.cpp, indra/newview/llconversationlog.cpp, indra/newview/llconversationlog.h,	indra/newview/llconversationloglist.cpp, indra/newview/llconversationloglist.h,	indra/newview/llconversationloglistitem.cpp, indra/newview/llconversationloglistitem.h,	indra/newview/llfloaterconversationlog.cpp, indra/newview/llfloaterconversationlog.h,	indra/newview/llfloaterconversationpreview.cpp, indra/newview/llfloaterconversationpreview.h,	indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/llimview.cpp, indra/newview/llimview.h,	indra/newview/llstartup.cpp, indra/newview/llviewerfloaterreg.cpp, indra/newview/llviewermessage.cpp, indra/newview/llvoicevivox.cpp, indra/newview/skins/default/xui/en/floater_conversation_log.xml, indra/newview/skins/default/xui/en/floater_conversation_preview.xml, indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml, indra/newview/skins/default/xui/en/menu_conversation_log_view.xml, indra/newview/skins/default/xui/en/menu_participant_view.xml, indra/ newview/skins/default/xui/en/panel_conversation_log_list_item.xml: CHUI-151 FIXED (Implement conversation log)

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 [e3eb1ca55171]

* indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-204 FIXED (Conversations panel can be re-sized too small with	all conversations torn off)

- Increased min width of conversations panel by 10 pixels [bbb78388c8fa]

* indra/newview/llimfloatercontainer.cpp: CHUI-198 FIXED (Hitting minimize option on conversations floater	closes floater, not minimize)

- Removed code which was hiding floater on minimizing floater. [25560cb1ebe6]

2012-07-26 Todd Stinson  <stinson@lindenlab.com>

* Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer- chui/. [cac889a25784]

* indra/newview/llpanelobjectinventory.cpp, indra/newview/skins/default/xui/en/strings.xml: CHUI-251: Adding back in the root 'Contents' folder under the Build floater Content tab. [c2825e0c1e4d]

* indra/newview/llpanelobjectinventory.cpp: CHUI-251: Resetting the object inventory panel after deleting the last object. [973a7f47b93a]

2012-07-26 Richard Linden  <Richard Linden>

* Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [e4fb89f081aa]

* indra/llxuixml/llinitparam.h, indra/newview/llinventoryfilter.cpp: made Deprecated params write-only [4056d1731b9d]

2012-07-25 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llnearbychat.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-230 [FIXED] Torn off conversation window size resizes when viewer window is resized [b007ff579949]

2012-07-25 Richard Linden  <Richard Linden>

* indra/llui/llfolderview.cpp, indra/newview/llfolderviewmodelinventory.cpp: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [38b347abbc24]

2012-07-24 Richard Linden  <Richard Linden>

* indra/llui/llfolderview.cpp, indra/newview/llfolderviewmodelinventory.cpp: CHUI-206 FIX Viewer crash when selecting to cut inventory item, then selecting to cut another inventory item Seems to work now, without filtering de-optimization [56b5f92fdf0f]

* indra/newview/llfolderviewmodelinventory.cpp: Backed out changeset: a20e437a726c [e65ecb50f0a3]

2012-07-25 Richard Linden  <Richard Linden>

* indra/llui/llsdparam.cpp: optimization of LLSD param parsing [a06d8f3aa791]

* indra/llui/llhandle.h, indra/newview/llpanelobjectinventory.cpp, indra/newview/llpanelobjectinventory.h:	CHUI-252 FIX Deleting an item from object contents in build tools crashes viewer also improved selection behavior for object contents when deleting/adding items [9302a7ff8d20]

* indra/llui/llfolderview.cpp, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewmodel.h,	indra/newview/llfolderviewmodelinventory.cpp, indra/newview/llfolderviewmodelinventory.h,	indra/newview/llimfloatercontainer.h,	indra/newview/llpanelobjectinventory.cpp: CHUI-222 FIX Selecting None in inventory filters does not update until inventory selected [294f0421b464]

* indra/newview/llfloatertools.cpp, indra/newview/llfolderviewmodelinventory.cpp, indra/newview/llfolderviewmodelinventory.h,	indra/newview/llinventorybridge.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanelobjectinventory.cpp, indra/newview/llpanelobjectinventory.h,	indra/newview/llplacesinventorybridge.cpp: CHUI-239 FIX Viewer crash when opening object with contents [042fdd70e749]

2012-07-24 Gilbert Gonzales  <gilbert@lindenlab.com>

* indra/llui/llfolderview.cpp, indra/newview/llpanelobjectinventory.cpp: CHUI-211: Problem was due to a non-heap variable being deleted and then referenced later (which was found by ProductEngine). Also the crash occurred at a specifc location llpangelobjectinventory::reset during a static_cast, so now using a dynamic_cast as a safeguard. [f1ee1fe6e88c]

2012-07-24 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llinventorybridge.h:	CHUI-209 FIX for properly updating folder names in folder view after they have been renamed. The old display name should be cleared before refreshing the views for both items and folders in folder view, otherwise the old name will be used upon renaming. [1436abf517be]

2012-07-24 Richard Linden  <Richard Linden>

* indra/llxml/llxmlnode.cpp: fix for gcc builds [705a352e4bad]

2012-07-23 Richard Linden  <Richard Linden>

* Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [4b5bff841d62]

* indra/llui/llnotifications.cpp, indra/llui/llsdparam.cpp, indra/llxml/llxmlnode.cpp, indra/llxml/llxmlnode.h,	indra/llxuixml/llinitparam.cpp, indra/llxuixml/llinitparam.h,	indra/llxuixml/llxuiparser.cpp: CHUI-227 FIX Teleport offers sent are not received cleaned up	serialization of LLSD to param block so that it can round-trip also, optimized LLXMLNode and fixed an assert [c228f404af59]

2012-07-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llinventorymodel.cpp, indra/newview/llinventorypanel.cpp: CHUI-207 FIXED Emptying Lost and Found and Trash in inventory crashes viewer [d0d7aadc72a4]

2012-07-19 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llnearbychat.cpp: CHUI-229 [FIXED] Nearby chat conversation does not appear initially in conversation list if no other conversations are present [db70c9beef9b]

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-231, CHUI-233 [FIXED] - Modified and simplified algorithm of	reshaping floater's body (content) and showing/hiding of the title for prevent of present and future issues with floater's	repositioning [f78380a316e7]

2012-07-19 Merov Linden  <merov@lindenlab.com>

* indra/newview/llinventorymodel.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h:	CHUI-236 : WIP : Places panel works for My Inventory but still empty lists for Favorites Bar, My Landmarks and Library. [c24f1a76047d]

2012-07-19 merov_linden  <merov_linden>

* indra/newview/llinventorymodel.cpp, indra/newview/llplacesinventorypanel.cpp: CHUI-236 : WIP : Modify the handling of FT_ROOT_INVENTORY which was creating havoc in LLInventoryModel instantiation. Still, some of those hack will have to come back on. [f9aeb60279d5]

2012-07-17 Merov Linden  <merov@lindenlab.com>

* Merge pull from richard/viewer-chui [e5579ab47291]

* indra/newview/llpanellandmarks.cpp, indra/newview/llplacesinventorypanel.cpp: CHUI-234 : Fix crashers in landmarks panel [ef26d3876495]

2012-07-17 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h:	Fixed positioning of conversations into container [1a77a071c4da]

2012-07-13 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llinventorypanel.cpp: CHUI-207 FIXED cancellation of removal of the object that has already been removed [6b5bdeba63bf]

* indra/newview/llfolderviewmodelinventory.cpp: CHUI-206 FIXED Viewer crash when selecting to cut inventory item, then selecting to cut another inventory item [a20e437a726c]

2012-07-13 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-205 FIXED conversations selection in the conversations list. Each conversation item is added to the folder view which lists all conversations. [03fa3603e443]

2012-07-12 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llnearbychat.cpp: CHUI-170 Workaround for the permanently showing of the nearbychat's	name in a conversations list when that floater is torn-off [633605c09ff2]

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-199 FIXED Save positioning of conversations between sessions [fd917023abf0]

2012-07-11 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-203 FIXED Conversations floater resizing when it is opened with FUI Chat button. [64f0728a93ec]

2012-07-10 Merov Linden  <merov@lindenlab.com>

* Pull from richard/viewer-chui [9badedb8b66b]

2012-07-09 Merov Linden  <merov@lindenlab.com>

* indra/newview/llavataractions.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/llviewermessage.cpp: Pull from richard/viewer-chui [1914a3c5b17e]

* Pull from richard/viewer-chui-folderview [ff7e2292874c]

2012-07-07 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llui/llfolderview.cpp: Another Linux build fix. [2d0223a22f70]

* indra/llui/llfolderviewmodel.h: Linux build fix. LLFolderViewModelItem placed before the call to a	method of this class in LLFolderViewModel::sort. [477b6180af18]

2012-07-09 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h: CHUI-98 : WIP. Clean up conversation list data structure and comments [f7a0617e8a62]

2012-07-05 Merov Linden  <merov@lindenlab.com>

* indra/llui/llfolderview.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-98 : WIP, use the refactored folder view for conversation view list [ffb3c34b202c]

2012-07-04 Richard Linden  <Richard Linden>

* indra/llui/llfolderview.cpp, indra/llui/llfolderviewitem.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-101 WIP Make LLFolderview general purpose partial fix for crash on startup [e122684e37f9]

2012-07-03 Richard Linden  <Richard Linden>

* indra/llui/CMakeLists.txt, indra/llui/llfolderview.cpp, indra/llui/llfolderview.h, indra/llui/llfolderviewitem.cpp, indra/llui/llfolderviewitem.h, indra/llui/llfolderviewmodel.cpp, indra/llui/llfolderviewmodel.h, indra/newview/CMakeLists.txt, indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h,	indra/newview/llfolderviewmodel.cpp, indra/newview/llfolderviewmodel.h,	indra/newview/llfolderviewmodelinventory.cpp, indra/newview/llfolderviewmodelinventory.h,	indra/newview/llimfloatercontainer.h,	indra/newview/llinventorybridge.h,	indra/newview/llinventorypanel.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/lltexturectrl.cpp: CHUI-101 WIP Make LLFolderview general purpose move llfolderview* into LLUI! [55123c67244a]

* indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewmodel.cpp, indra/newview/llfolderviewmodel.h,	indra/newview/llinventorybridge.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h:	CHUI-101 WIP Make LLFolderview general purpose removed viewer dependencies from folderview code [ea124f4db9a7]

* indra/newview/CMakeLists.txt, indra/newview/llfolderviewitem.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h:	Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui- folderview [a1b6da8ba2c7]

2012-07-02 Richard Linden  <Richard Linden>

* indra/newview/CMakeLists.txt, indra/newview/llavataractions.cpp, indra/newview/llfoldervieweventlistener.h,	indra/newview/llfolderviewitem.cpp: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [af0fc823890a]

* indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h, indra/newview/llfolderviewmodel.h,	indra/newview/llfolderviewmodelinventory.cpp, indra/newview/llinventoryfunctions.cpp, indra/newview/llinventoryfunctions.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanellandmarks.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelobjectinventory.cpp: CHUI-101 WIP Make LLFolderView general purpose started to remove newview dependencies from llfolder* [fdffdca40170]

* indra/newview/llimfloatercontainer.h:	CHUI-101 WIP Make LLFolderView general purpose fixed build post merge [fedfbe2721c0]

* indra/newview/CMakeLists.txt, indra/newview/llavataractions.cpp, indra/newview/llfoldervieweventlistener.h,	indra/newview/llfolderviewitem.cpp: Pull merge from richard/viewer-chui [9941d68d4093]

* indra/newview/CMakeLists.txt, indra/newview/llfolderview.cpp, indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h,	indra/newview/llfolderviewmodel.cpp, indra/newview/llfolderviewmodel.h,	indra/newview/llfolderviewmodelinventory.cpp, indra/newview/llfolderviewmodelinventory.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h, indra/newview/lltexturectrl.cpp: CHUI-101 WIP Make LLFolderView general purpose refactored source files, moving logic into llfolderviewmodel*.cpp filter logic tweaks purging and moving inventory now properly cleans up view model [b942ed72f06a]

2012-06-29 Richard Linden  <Richard Linden>

* indra/newview/llfolderview.cpp, indra/newview/llfolderviewmodel.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanelobjectinventory.cpp, indra/newview/lltexturectrl.cpp: CHUI-101 WIP Make LLFolderView general purpose cleaned up some stale TODOs worked on getting initial inventory display to work consistently [b827371ed7d9]

* indra/newview/llfolderview.cpp: CHUI-101 WIP Make LLFolderView general purpose fixed build [b01ebb3bb4dc]

2012-06-28 Richard Linden  <Richard Linden>

* indra/newview/llfolderview.h, indra/newview/llfolderviewitem.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/llpanelobjectinventory.h:	CHUI-101 WIP Make LLFolderview general purpose cleaned up ownership of viewmodel more filtering fixes [c9cd8e0b9755]

* indra/newview/llfolderview.cpp, indra/newview/llfolderviewitem.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanelmarketplaceinboxinventory.cpp, indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llplacesinventorybridge.cpp, indra/newview/llplacesinventorybridge.h,	indra/newview/llplacesinventorypanel.cpp: CHUI-101 WIP Make LLFolderview general purpose filtering mostly working [8503354e6772]

2012-06-27 Richard Linden  <Richard Linden>

* indra/newview/llfolderviewmodel.h:	CHUI-101 WIP Make LLFolderView general purpose fixed crash on	startup [3b1a2238a844]

* indra/llui/llnotifications.cpp, indra/newview/llfolderview.cpp, indra/newview/llfolderview.h, indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h, indra/newview/llfolderviewmodel.h,	indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llinventoryfilter.h,	indra/newview/llinventoryfunctions.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanellandmarks.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/llsidepanelappearance.cpp, indra/newview/lltexturectrl.cpp: CHUI-101 WIP Make LLFolderView general purpose moved filtering logic to viewmodel [8f6986960b12]

2012-06-25 Richard Linden  <Richard Linden>

* indra/newview/llinventorybridge.cpp: CHUI-101 WIP Make LLFolderView general purpose all inventory names are correctly initialized now [5c3e7e29cb7d]

2012-06-22 Richard Linden  <Richard Linden>

* indra/llui/lluictrlfactory.cpp, indra/llui/lluictrlfactory.h,	indra/llxuixml/llregistry.h, indra/newview/llfolderviewmodel.h:	CHUI-101 WIP Make LLFolderView general purpose build fix for gcc added detection of duplicate widget registration [8deb5d00ec09]

2012-06-21 Richard Linden  <Richard Linden>

* indra/newview/llfavoritesbar.cpp, indra/newview/llfavoritesbar.h,	indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h, indra/newview/llfolderviewmodel.h,	indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventorymodel.cpp, indra/newview/llinventorymodel.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanelmarketplaceinboxinventory.cpp, indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/llviewerinventory.cpp, indra/newview/llviewerinventory.h:	CHUI-101 WIP Make LLFolderview general purpose inventory item labels and icons displaying again [35d2adb847c1]

* indra/newview/llfolderview.cpp, indra/newview/llinventorypanel.cpp: CHUI-101 WIP Make LLFolderview general purpose one more gcc build fix [8f975dfceb84]

2012-06-20 Richard Linden  <Richard Linden>

* indra/newview/llfolderviewitem.h, indra/newview/llfolderviewmodel.h:	CHUI-101 WIP Make LLFolderView general purpose build fix for gcc [7bfb46055db2]

* indra/newview/llfolderview.cpp, indra/newview/llfolderviewmodel.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llinventoryfilter.h:	CHUI-101 WIP Make LLFolderView general purpose fixed final build errors [feaccf54d3b0]

* indra/llinventory/llinventory.cpp, indra/newview/llfolderview.cpp, indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h, indra/newview/llfolderviewmodel.h,	indra/newview/llinventorybridge.h,	indra/newview/llinventoryfilter.h,	indra/newview/llinventorypanel.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelmarketplaceinboxinventory.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/llpaneloutfitedit.cpp, indra/newview/llplacesinventorypanel.cpp, indra/newview/llsidepanelinventory.cpp, indra/newview/lltexturectrl.cpp, indra/newview/llviewerinventory.cpp, indra/newview/llviewermessage.cpp: CHUI-101 WIP Make LLFolderview general purpose more compilation fixes, just need to add getName back to LLInventoryFilter et al	[4d825604b803]

2012-06-19 Richard Linden  <Richard Linden>

* indra/newview/llavataractions.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanellandmarks.cpp, indra/newview/llpanellandmarks.h,	indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelmarketplaceinbox.cpp, indra/newview/llpanelmarketplaceinboxinventory.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/lltexturectrl.cpp: CHUI-101 WIP Make LLFolderview general purpose added more casts to LLFolderViewModelItemInventory, etc. to fix compile errors [e00f1321618e]

* Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui- folderview [4a0edfa3650b]

2012-06-18 Richard Linden  <Richard Linden>

* indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h, indra/newview/llfolderviewmodel.h,	indra/newview/llinventorybridge.cpp, indra/newview/llinventoryfilter.cpp, indra/newview/llinventoryfilter.h,	indra/newview/llinventoryfunctions.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanelobjectinventory.cpp, indra/newview/llsidepanelinventory.h:	CHUI-101 WIP Make LLFolderView general purpose continuing fixing build errors general cleanup [041cb02b6c19]

2012-06-15 Richard Linden  <Richard Linden>

* indra/newview/CMakeLists.txt, indra/newview/llavataractions.cpp, indra/newview/llfloateroutbox.cpp, indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfoldervieweventlistener.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h, indra/newview/llfolderviewmodel.h,	indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llinventoryfilter.h,	indra/newview/llinventoryfunctions.cpp, indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanellandmarks.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelmarketplaceinbox.cpp, indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/llpaneloutfitedit.cpp, indra/newview/llplacesinventorypanel.cpp, indra/newview/llsidepanelappearance.cpp, indra/newview/llsidepanelinventory.cpp, indra/newview/lltexturectrl.cpp: CHUI-101 WIP Make LLFolderView general purpose continuing fixing build errors renamed llfoldervieweventlistener.h to	llfolderviewmodel.h	[80ad0918e6d5]

* indra/newview/llavataractions.cpp, indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfoldervieweventlistener.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h,	indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llinventoryfilter.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanellandmarks.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/llsidepanelinventory.cpp, indra/newview/lltexturectrl.cpp, indra/newview/llviewermessage.cpp: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui- folderview [af8d33dee0a5]

* indra/llinventory/llinventory.cpp, indra/llinventory/llinventory.h,	indra/llxuixml/llinitparam.h, indra/newview/llavataractions.cpp, indra/newview/llfloateroutbox.cpp, indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfoldervieweventlistener.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llfolderviewitem.h, indra/newview/llfriendcard.cpp, indra/newview/llinventorybridge.cpp, indra/newview/llinventorybridge.h,	indra/newview/llinventoryfilter.cpp, indra/newview/llinventoryfilter.h,	indra/newview/llinventorypanel.cpp, indra/newview/llinventorypanel.h,	indra/newview/llpanellandmarks.cpp, indra/newview/llpanelmaininventory.cpp, indra/newview/llpanelmarketplaceinbox.cpp, indra/newview/llpanelmarketplaceinboxinventory.cpp, indra/newview/llpanelmarketplaceinboxinventory.h,	indra/newview/llpanelmarketplaceoutboxinventory.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/llpaneloutfitedit.cpp, indra/newview/llplacesinventorybridge.cpp, indra/newview/llplacesinventorypanel.cpp, indra/newview/llsidepanelappearance.cpp, indra/newview/llsidepanelinventory.cpp, indra/newview/llsidepanelinventory.h,	indra/newview/lltexturectrl.cpp, indra/newview/llviewerinventory.cpp, indra/newview/llviewerinventory.h,	indra/newview/llviewermessage.cpp: CHUI-101 WIP Make LLFolderView general purpose llfolderview refactornig [8ddee66b9e4e]

2012-07-10 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h:	CHUI-201 FIX for crash when leaving a voice call via the end call prompt. Fixed the problem with confirmLeaveCallCallback firing after the chat floater is destroyed. [d08bd785924e]

2012-07-06 Paul ProductEngine  <pguslisty@productengine.com>

* indra/llui/lltextbase.cpp: CHUI-196 FIXED (Chat text entry area gets resized unexpectedly with	certain user display names)

- Fixed label length calculating [e0bbe530df2a]

2012-07-06 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: build fix [698db0cc9d84]

2012-07-04 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/app_settings/settings.xml, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	CHUI-170 FIXED Save Torn off state of Nearby Chat between sessions [74376a089e45]

* indra/newview/llimview.cpp: CHUI-195 FIXED Starting ad-hoc conference call does not open Conversations floater [3300dbc2c4be]

2012-07-05 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-197 FIXED Conversation names updating when checked corresponding preference [f28160767238]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llnearbychat.cpp: CHUI-200 FIXED Show correct and localized name of the nearby chat In	the conversations list [394635417581]

2012-07-04 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llblocklist.cpp: CHUI-136 ADDITIONAL FIX (Implement new design for blocked list on	the people floater)

- Disabled object profile functionality according to the spec [d2fc177db5f5]

* indra/newview/llblocklist.cpp: CHUI-189 FIXED (Blocked objects by name are not sorted correctly)

- Fixed sort criteria. It's needed to take into account that objects in mute list are represented by two types: LLMute::BY_NAME and LLMute::OBJECT [5832b31f33c8]

2012-07-04 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llnearbychat.cpp: CHUI-172 CHUI-183 FIX Disabled applying stored rect dimensions when Nearby chat is hosted in Conversations floater. [0506add33a05]

2012-07-03 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-164 : Fix crash when closing conversations using the conversation widget. Populated the sessionRemoved method with code to close the floater and clean up the list. [dd9d513105ec]

* Pull merge from richard/viewer-chui [bbeb54fe2a02]

* indra/newview/llviewermessage.cpp: CHUI-174 : Fixed crash in forced response to notifications. Use an	empty form in that case and allow the notification to not be in the notifications list. [8cf3ea392b29]

2012-07-03 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp: CHUI-188 FIX for crash in adding chat participants. Modified the duplicated participants check procedure LLIMFloater::canAddSelectedToChat to use the list, updated by	LLSpeakerMgr instead of LLIMSession::mInitialTargetIDs list, which is initialized at session start and not updated afterwards. [66a0292d9bff]

* indra/newview/llavataractions.cpp, indra/newview/llavataractions.h,	indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/llpanelpeoplemenus.cpp: CHUI-186 CHUI-187 FIX Removing a P2P convrsation from converstaion widget in the upper right corner when a new participant is added. End call prompt removed when adding a new participant to a P2P voice call. After adding a participant to a P2P voice conversation the resulting conference call is restarted voice invites to all participants. [7bdd797502b3]

2012-07-02 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llchathistory.cpp: CHUI-103 FIXED (Implement changes to compact chat view) Change coloration [b038e84d6c8f]

2012-07-02 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llchatitemscontainerctrl.cpp: CHUI-172 WIP Fixed drawing the nearby chat toast contents. Fixed warnings when creating a nearby chat toast. [a8d5c2d7fdb0]

2012-06-28 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp: CHUI-168 FIXED, CHUI-183 FIXED Supress of a resizable and dragging and hide a title for the docked floater [ca8cbe1e3293]

2012-06-29 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-164 : Fix conversation list index using handle to floater rather than uuid. Simplify the code accordingly (suppress hacks). [e5522a98857b]

* indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h: CHUI-164 : Fix crash when removing ad-hoc conversation. Turns out that sessions uuids are not constant so I shouldn't use them as index in the conversation list. More complete fix to follow. [454b4639f5e1]

2012-06-28 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [fe86fbc1f625]

* indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.p	ng, indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne .png, indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ sw.png, indra/newview/skins/default/textures/icons/Conv_toolbar_call _log.png, indra/newview/skins/default/textures/icons/Conv_toolbar_close.png, i	ndra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png, indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png, indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png, indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.pn	g, indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png, indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png, indra/newview/skins/default/textures/textures.xml, indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-82 : Fixed all icons to use the new Conv_*.png icons; please use those in the new UIs moving forward [73112e3e1cf2]

* Merge pull in richard/viewer-chui [8cc7ba8bb1bc]

2012-06-27 Merov Linden  <merov@lindenlab.com>

* indra/newview/app_settings/settings.xml: CHUI-184 : Change default pref LetterKeysFocusChatBar from 1 (chat) to 0 (WASD movements) [1d5b06956a25]

2012-06-27 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llchicletbar.cpp: CHUI-125 FIXED Supressed of a commented out code [b97f3cca9bd6]

2012-06-27 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloater.cpp: CHUI-146 : Fixed. Focus goes to first conversation in list when a	conversation is dismissed. [2e3e300f3f01]

* indra/newview/llnearbychat.cpp: CHUI-162 : Simplified the nearby chat show method following CHUI-139 fixes [c3d6894bf6c7]

* Pull merge from richard/viewer-chui [ee45e1f30061]

* indra/newview/llimfloatercontainer.cpp: CHUI-130 : Leave minimized torn off IM untouched when showing hiding the whole set of conversations [a2e9cc219009]

* indra/newview/llimfloatercontainer.cpp: CHUI-139 : Make sure the Nearby Chat shows up in the conversations floater in every situation [27a705066609]

2012-06-27 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	CHUI-162 FIXED Opening a nearby chat when text entered [c6e6e57878a2]

2012-06-27 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp: CHUI-169 FIX Restored inventory sharing functionality via IM floater drag and drop. [abe652f00830]

* indra/newview/llimfloater.cpp: CHUI-147 FIX Added check against empty participants names array to pass the assertion in LLAvatarActions::buildResidentsString. [e1a457a620c3]

2012-06-26 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llavataractions.cpp, indra/newview/llavataractions.h,	indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h, indra/newview/llparticipantlist.cpp: CHUI-147 FIX Added updating conference participants in IM floater title - The title is updated with the data from participants list widget in IM floater. - Creating the participants list is fixed for the case of starting the ad hoc session when the session id changes upon initialization (see	LLIMConversation::buildParticipantList). - LLEventTimer replaced with simple LLTimer to avoid crashes in LLEventTimer::tick. - Moved the build_residents_string code to	LLAvatarActions::buildResidentsString to use it in LLIMFloater::onParticipantsListChanged. [061aa707f1e6]

2012-06-27 Paul ProductEngine  <pguslisty@productengine.com>

* indra/llui/lltextbase.cpp: CHUI-180 FIXED (Started an ad hoc IM spams log with drawtext	warning)

- Don't draw TextBase context if it's empty and in focus [dd81bc3ea89a]

2012-06-26 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloater.cpp: Pull merge from richard/viewer-chui [0aa18873e382]

* indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-164 : Fix crash when closing ad-hoc conversations; insure consistency of the conversation list when adding and removing items from it	[723e1ae50de6]

2012-06-26 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/skins/default/xui/en/widgets/chat_editor.xml: - CHUI-178 (Right click context menu not present in chat entry	field)

- Set parameter to true to show context menu [d850947c7ef4]

* indra/llui/llchatentry.cpp: CHUI-182 FIXED (Vertical scrollbar flashes on and off when chat	entry text area expands)

- To avoid unnecessary appearing of scrollbar, first chat entry must be expanded and only then decision should be taken in the base class whether scrollbar should be shown or not. [f5e69bf8079b]

* indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-177 ADDITIONAL FIX (Text entry field in chat only accepts 256	characters)

- Limited text entry field to 1024 instead of 1025 characters should take into account zero (0 ... 1023) [7298d30168bd]

2012-06-25 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp: CHUI-168 FIXED Added call of updateHeaderAndToolbar from postBuild for correct floater's title and standard buttons showing at start [5243bb9ee46e]

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp: CHUI-167 FIXED Move onClose from LLIMFloater to it's basic class (LLIMConversation) for correct using add/remove conversation list items also for LLNearbyChat [ebd0ce459ace]

2012-06-25 Merov Linden  <merov@lindenlab.com>

* Pull merge from richard/viewer-chui [2b6eb9a5dd7f]

* indra/llui/llmultifloater.h, indra/newview/llimconversation.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-139 : Hide torn off floaters when hiding conversation list; make nearby chat always present; leave conversation list around when all torn off [992fe256cee9]

2012-06-25 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-175 FIXED (Cannot use scroll bar on chat entry field when multi	line chat is added)

- This change also fixes: CHUI-176 (Only bottom 2 lines of	multi line chat allow for selecting in text chat entry) CHUI-177 (Text entry field in chat only accepts 256 characters) [fd74b33ba60e]

2012-06-22 merov

* indra/newview/llblocklist.cpp: CHUI-136 : Fix compilation issue showing up when warning treated as	errors [7dcac0050cbb]

2012-06-22 Paul ProductEngine  <pguslisty@productengine.com>

* indra/newview/llblockedlistitem.cpp, indra/newview/skins/default/xui/en/panel_blocked_list_item.xml: CHUI-136 ADDITIONAL FIX (Implement new design for blocked list on	the people floater)

- If mute item type is LLMute::BY_NAME it means that it's an object and we should show corresponding icon - Also added icon for blocked groups [082ffde66e1f]

* indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/llblockedlistitem.cpp, indra/newview/llblockedlistitem.h, indra/newview/llblocklist.cpp, indra/newview/llblocklist.h, indra/newview/llgrouplist.h,	indra/newview/llpanelblockedlist.cpp, indra/newview/llpanelblockedlist.h,	indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml, indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml, indra/newview/skins/default/xui/en/menu_people_blocked_view.xml, indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml, indra/newview/skins/default/xui/en/panel_blocked_list_item.xml, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-136 FIXED (Implement new design for blocked list on the people	floater)

- Created new LLBlockList class and replaced LLScrollContainer with it - Also created new LLBlockedListItem class which represents blocked objects and blocked avatars [9094acebc7e3]

* indra/llui/llchatentry.cpp: CHUI-127 ADDITIONAL FIX (Make chat field auto resizable)

- Fixed crash which occurred while navigating through history of	sent messages [a8068db564d6]

* indra/llui/llchatentry.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-161 FIXED (Text entered in local chat is not visible to other	users nearby)

- Applied Merov's fix. The problem was that text_editor was registered twice and, depending of the machine you ran, the viewer would pick one or the other. Mac users were unlucky enough to pick the wrong one all the time. [607ff7abc58e]

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h, indra/newview/llviewerwindow.cpp: CHUI-160 FIXED (Text entered in local chat text field scrolls up and	becomes only partially visible after hitting return)

- Replaced LLLineEditor with LLChatEntry in nearby chat - Moved reshape method from LLIMFloater to the base LLIMConversation so that vertical reshaping work properly for both LLNearbyChat and LLIMFloater [9be077fd7ef9]

2012-06-22 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimview.cpp: CHUI-100 Fix floater's key [ebb48eaae82b]

2012-06-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp: CHUI-149 [WIP] Add the participant list to the nearby chat as IM- conversation [5e2988edbcfe]

2012-06-21 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llchicletbar.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Merge [ef65ec56c3a3]

2012-06-20 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llchiclet.h, indra/newview/llchicletbar.cpp, indra/newview/llchicletbar.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h, indra/newview/llimview.cpp, indra/newview/llimview.h, indra/newview/llsyswellwindow.h:	CHUI-125 FIXED if a call is accept then open im-session's floater [8afdc66832ba]

2012-06-19 Merov Linden  <merov@lindenlab.com>

* indra/newview/app_settings/settings.xml, indra/newview/llfloaterpreference.cpp, indra/newview/llimconversation.cpp, indra/newview/skins/default/xui/en/panel_preferences_chat.xml: CHUI-142 : Changes to chat related preferences [84b1846c47c8]

* indra/newview/llimfloatercontainer.cpp: CHUI-148 : Fix reattaching on a hidden message panel; also prevents recreation of list items (eventually lead to crashes). [b4622abee126]

* indra/newview/llchicletbar.cpp, indra/newview/llimfloater.cpp: CHUI-138 : Suppress chiclets for conversations when using tabbed UI; Make sure list is cleaned up on close [7ca545fd069f]

* indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp: Merge pull from richard/viewer-chui [edac46c19a16]

2012-06-18 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp: CHUI-146 : Refocus on the first conversation when closing another conversation, don't let focus falls out [9f567bf0e620]

* indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-145 : Select on list focus on relevant panel, torn off or not; torn off im stay in list; closed im suppressed from lits in all situations [84af1b75c5d2]

* Merge pull from richard/viewer-chui [4630dd19490d]

* indra/llui/llmultifloater.cpp, indra/newview/llimfloatercontainer.cpp: CHUI-145 : WIP Always open the message pane when clicking on a	conversation in the list [4c5bae096371]

2012-06-19 Paul ProductEngine  <pguslisty@productengine.com>

* indra/llui/llchatentry.cpp: Win build fix [e366f4d9b010]

* indra/llui/CMakeLists.txt, indra/llui/llaccordionctrltab.cpp, indra/llui/llchatentry.cpp, indra/llui/llchatentry.h,	indra/llui/lltextbase.cpp, indra/llui/lltextbase.h,	indra/llui/lltexteditor.cpp, indra/llui/lltexteditor.h,	indra/newview/llexpandabletextbox.cpp, indra/newview/llgrouplist.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llpaneltopinfobar.cpp, indra/newview/lltoastgroupnotifypanel.cpp, indra/newview/lltoastpanel.cpp, indra/newview/lltoastscripttextbox.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/widgets/text.xml: CHUI-127 FIXED (Make chat field auto resizable)

- Replaced LLLineEditor with newly created LLChatEntry - Moved some functionality (such as setting label) to the LLTextBase as it can be useful to the other derived classes [75d225f0e47d]

2012-06-18 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	CHUI-100 WIP Fix translate chat checkbox showing [c5dde0f2b578]

* indra/newview/llimfloatercontainer.cpp, indra/newview/llnearbychat.cpp, indra/newview/llviewerwindow.cpp: CHUI-119 fixed bug with creating multiply instances of the nearby chat; [e63b8d442b25]

2012-06-15 AlexanderP ProductEngine  <apaschenko@productengine.com>

* Merge [4d05de754ee3]

2012-06-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llnearbychat.cpp, indra/newview/llnearbychathandler.cpp, indra/newview/llviewerfloaterreg.cpp: CHUI-199 WIP Modified the nearby chat for using floater_im_session.xml; merging LLNearbyChatBar with LLNearbyChat; clean up code; supressed a double creation of LLNearbyChat [6081ef8d9ca4]

2012-06-14 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	Pull merge from richard/viewer-chui [fe888204daa8]

* indra/newview/app_settings/commands.xml, indra/newview/llimfloatercontainer.cpp, indra/newview/skins/default/xui/en/strings.xml: CHUI-139 : Use the Chat toolbar button to open and close the conversations multi floater. Force Nearby Conversation if floater is empty. [1af27098cb39]

2012-06-13 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	EXP-137 : Comments cleanup [4ce35cad3b34]

2012-06-11 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-137 : Implemented tear off and close of conversation in the list [25aa279dd81b]

* indra/newview/llfolderviewitem.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-137 : Implemented switch conversation in the conversation list [29f0e6dff4aa]

2012-06-08 Merov Linden  <merov@lindenlab.com>

* indra/newview/llimfloatercontainer.h:	CHUI-137 : Fix build error after merge [8a549671c15e]

* indra/newview/app_settings/shaders/class1/deferred/giV.glsl, indra/newview/app_settings/shaders/class1/deferred/postgiV.glsl, indra/newview/llfolderviewitem.cpp, indra/test/llhttpclient_tut.cpp: Merge pull from richard/viewer-chui [d70c59650c46]

* indra/newview/llfolderviewitem.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-137 : Implement conversation list, temporary solution: add but doesn't take out items from the list [d3b4d1fc98a9]

* indra/newview/llfolderviewitem.cpp: CHUI-137 : Fix crasher in item drawing [5ee68e25a10f]

2012-06-06 Merov Linden  <merov@lindenlab.com>

* indra/newview/llfolderviewitem.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-137 : Implement temporary conversations list (not working yet) [530f7714b9fc]

2012-06-14 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h:	CHUI-144 FIXED Residents picker added to Conversations panel + button. [c4ff18a0b564]

2012-06-13 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llavatarlistitem.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/lltooldraganddrop.cpp: CHUI-120 WIP Modified chat participants drag and drop not to use LLClipboard. [af85da49e4e2]

* indra/newview/llimconversation.cpp, indra/newview/llimfloater.cpp, indra/newview/llnearbychat.cpp: CHUI-120 WIP Fix for crash after closing the chat floater. [b3adb73ad425]

2012-06-12 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llnearbychat.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-119 WIP Suppressed of the warnings (XML corrected); fixed the torn-off button's states [9a4e4d792325]

2012-06-11 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llstartup.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-119 WIP Fixed some bugs [14ccab3073d1]

2012-06-08 Merov Linden  <merov@lindenlab.com>

* Merge pull from richard/viewer-chui [3bbe697fae97]

2012-06-08 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llchathistory.cpp: CHUI-103 FIXED Added a square brackets to system messages; changed a	default color for user messages [d8da91b91498]

2012-06-05 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llchathistory.cpp, indra/newview/skins/default/colors.xml: CHUI-103 Added square brackets to a messages from Second Life in the plain text mode; changed the default colors of user's messages [832f8e844aff]

2012-06-08 Merov Linden  <merov@lindenlab.com>

* indra/newview/llavatarlistitem.cpp: Fix post merge build issue: take clipboard changes into account [a7b6b0055075]

* indra/newview/llavataractions.cpp, indra/newview/llimconversation.cpp, indra/newview/lltoolbarview.cpp, indra/newview/lltooldraganddrop.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: Merge pull from richard/viewer-chui [aa92b2bcbd7c]

2012-06-08 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-122 FIX Add button enabled only for P2P and ad hoc IM sessions. [ca3193e6d104]

* indra/llcommon/llassettype.cpp, indra/llcommon/llassettype.h,	indra/llcommon/stdenums.h, indra/llinventory/llinventorytype.cpp, indra/llinventory/llinventorytype.h,	indra/newview/llavatarlistitem.cpp, indra/newview/llavatarlistitem.h,	indra/newview/llimconversation.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/lltoolbarview.cpp, indra/newview/lltooldraganddrop.cpp, indra/newview/lltooldraganddrop.h,	indra/newview/llviewerassettype.cpp: CHUI-120 WIP Added conversations participants drag and drop from avatar lists to IM floaters. - Added new drag and drop type DAD_PERSON and source SOURCE_PEOPLE to avoid highliting the toolbars when using SOURCE_VIEWER. - Disabled calling card drop support as it is considered obsolete. [4b41cc41f20b]

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h:	CHUI-120 WIP Added avatar picker that allows to add other users to an existing chat if they don't participate in it already. [39d4da3b25d7]

2012-06-07 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llavataractions.cpp, indra/newview/llavataractions.h,	indra/newview/llchicletbar.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimview.cpp, indra/newview/llimview.h, indra/newview/llnearbychat.cpp, indra/newview/llpanelpeoplemenus.cpp, indra/newview/llstartup.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P chat, after adding more participants. - Added a parameter to LLAvatarActions::startConference and LLIMMgr::addSession to pass the uuid of a P2P IM floater which should be used to start a new conference in it. - In LLChicletBar::sessionRemoved we don't close the IM floater if it is going to be re-used for a new conference. [7939883731fb]

2012-06-07 Merov Linden  <merov@lindenlab.com>

* indra/llmessage/tests/llhttpclient_test.cpp, indra/test/llhttpclient_tut.cpp: Pull test fixes from : nat/viewer-llhttpclient-tests/ [47a200befd7f]

* BuildParams, indra/llmath/llcoord.h, indra/llui/llfloater.cpp, indra/llui/llfloater.h, indra/llui/lllayoutstack.h,	indra/llui/llview.cpp, indra/newview/CMakeLists.txt, indra/newview/app_settings/settings.xml, indra/newview/app_settings/settings_per_account.xml, indra/newview/app_settings/shaders/class1/deferred/giV.glsl, indra/newview/app_settings/shaders/class1/deferred/postgiV.glsl, indra/newview/llavataractions.cpp, indra/newview/llfolderview.cpp, indra/newview/llfolderview.h, indra/newview/llfolderviewitem.cpp, indra/newview/llimconversation.cpp, indra/newview/llpanelobjectinventory.cpp, indra/newview/lltoastnotifypanel.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h, indra/newview/pipeline.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/floater_people.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/panel_nearby_chat.xml, indra/newview/skins/default/xui/en/strings.xml: Merge : pull from lindenlab/viewer-release [780b473c8d15]

2012-06-06 Todd Stinson  <stinson@lindenlab.com>

* Pull and merge a single changeset from http://hg.lindenlab.com/nat /viewer-maint-1144/ to resolve build issues. [b26ca826699b]

2012-06-01 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h:	Build fix [8bfb7b208ccf]

* indra/newview/llnearbychat.cpp, indra/newview/llstartup.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-119 FIXED Bug fixed. Clean up a code [abfa9c1f77dc]

2012-05-31 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/CMakeLists.txt, indra/newview/llagent.cpp, indra/newview/llchatitemscontainerctrl.cpp, indra/newview/llfloatertranslationsettings.cpp, indra/newview/llgesturemgr.cpp, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimview.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h, indra/newview/llnearbychatbar.cpp, indra/newview/llnearbychatbar.h,	indra/newview/llnearbychatbarlistener.cpp, indra/newview/llnearbychatbarlistener.h,	indra/newview/llnearbychathandler.cpp, indra/newview/llnotificationtiphandler.cpp, indra/newview/llpanelimcontrolpanel.cpp, indra/newview/llviewerfloaterreg.cpp, indra/newview/llviewergesture.cpp, indra/newview/llviewerkeyboard.cpp, indra/newview/llviewerwindow.cpp, indra/newview/skins/default/xui/en/floater_chat_bar.xml, indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml, indra/newview/skins/default/xui/en/panel_group_control_panel.xml, indra/newview/skins/default/xui/en/panel_nearby_chat.xml: CHUI-119 WIP [061916a8b4ae]

2012-05-30 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimconversation.cpp, indra/newview/llnearbychatbar.cpp, indra/newview/llnearbychatbar.h:	Build fix [03e6e19fb882]

* indra/llui/llfloater.cpp, indra/llui/llfloater.h,	indra/llui/llview.cpp, indra/newview/CMakeLists.txt, indra/newview/llfloaterpreference.cpp, indra/newview/llimconversation.cpp, indra/newview/llimconversation.h, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimview.cpp, indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h, indra/newview/llnearbychatbar.cpp, indra/newview/llnearbychatbar.h,	indra/newview/skins/default/xui/en/floater_chat_bar.xml, indra/newview/skins/default/xui/en/panel_nearby_chat.xml: CHUI-119 WIP Prepare the nearby chat for hosting it by the IM- container [fd23077b105f]

2012-05-29 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llui/lltabcontainer.cpp: CHUI-105 WIP Fixed "is not a child of" warning when removing a tab from LLSideTrayPanelContainer. [fd781eae5df3]

2012-05-25 Richard Linden  <Richard Linden>

* indra/newview/llscreenchannel.cpp: CHUI-131 FIX Crash when selecting Show on inventory offer notification if other notifications are being received [bb9cd6fb4919]

* indra/llui/llnotifications.cpp: CHUI-132 FIX Modal dialogs cannot be dismissed [5f9cd27cff6d]

2012-05-24 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llui/lltoggleablemenu.h, indra/newview/llgrouplist.cpp, indra/newview/llgrouplist.h, indra/newview/llpanelpeople.cpp, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-78 FIXED group actions gear menu in People->Groups. Used the same menu for groups list context menu and gear menu in People->Groups. Changed the type of groups list context menu to toggleable. [8ab42dfd17b8]

2012-05-22 Paul ProductEngine  <pguslisty@productengine.com>

* indra/llui/llnotifications.h:	Linux build fix

GCC does not allow local functor classes to be used with template algorithms, because template arguments must refer to an entity with external linkage. [a98f62758f00]

2012-05-21 Richard Linden  <Richard Linden>

* indra/llui/tests/llurlentry_stub.cpp, indra/llui/tests/llurlmatch_test.cpp, indra/llxuixml/llinitparam.cpp, indra/llxuixml/llinitparam.h:	made param blocks smaller by making param overhead 3 bytes instead of 4 Optional should now be 4 bytes smaller. [5ad6d1733cda]

* indra/newview/lltoastnotifypanel.cpp: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [edcdb88f633d]

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/llui/llsdparam.cpp, indra/llxuixml/llinitparam.h,	indra/newview/llnotificationstorage.cpp, indra/newview/lltoastnotifypanel.cpp: CHUI-111 FIX Saved notifications are not sorted in same order after logout and relog. sort notifications in separate list llnotification now uses param block to serialize to llsd [3d481c6900a4]

2012-05-18 Richard Linden  <Richard Linden>

* indra/newview/llnotificationalerthandler.cpp, indra/newview/llnotificationhandler.h,	indra/newview/llscreenchannel.cpp: CHUI-96 FIX Cannot dismiss modal dialogs related to merchant outbox notification duplicate suppression now doesn't generate multiple dialogs [1c4e0d1663b9]

2012-05-21 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/lltoastnotifypanel.cpp: gcc build fix. [3fc68d96bb80]

2012-05-18 Richard Linden  <Richard Linden>

* indra/newview/llchathistory.cpp, indra/newview/llimfloater.cpp, indra/newview/skins/default/xui/en/strings.xml: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [f6dd01237051]

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/llui/llnotificationtemplate.h,	indra/newview/llavataractions.cpp, indra/newview/llcallingcard.cpp, indra/newview/llchathistory.cpp, indra/newview/llchatitemscontainerctrl.cpp, indra/newview/llchatitemscontainerctrl.h,	indra/newview/llimfloater.cpp, indra/newview/llnearbychathandler.cpp, indra/newview/llnotificationgrouphandler.cpp, indra/newview/llnotificationhandler.h,	indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationofferhandler.cpp, indra/newview/llnotificationscripthandler.cpp, indra/newview/llnotificationtiphandler.cpp, indra/newview/llscreenchannel.cpp, indra/newview/llscreenchannel.h,	indra/newview/lltoast.h, indra/newview/lltoastimpanel.h,	indra/newview/lltoastnotifypanel.cpp, indra/newview/lltoastnotifypanel.h, indra/newview/lltoastpanel.cpp, indra/newview/lltoastpanel.h, indra/newview/llviewermessage.cpp, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/strings.xml: CHUI-112 FIX Clicking Show or Discard in an inventory offer toast does not dismiss toast removed special case logic for dealing with user online/offline collisions added ability to cancel old duplicate notifications [f3aaaae9efa8]

2012-05-18 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp: CHUI-121 FIXED showing chat participants list only in torn off IM floaters. [f22e817d39e7]

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h: CHUI-105 WIP Minor code clean up and optimization. Removed overloaded updateTitleButtons and moved its functionality to a new method that should be called less frequently. [a2a3a3adccd8]

2012-05-17 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llfloaterpreference.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/llimview.cpp, indra/newview/llimview.h,	indra/newview/llnearbychat.cpp, indra/newview/llnearbychat.h: CHUI-105 ADD. FIX Implement changes to all open conversations and nearby chat [51d0370c9c2e]

2012-05-17 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llui/lllayoutstack.h, indra/llui/llmultifloater.cpp, indra/llui/llmultifloater.h,	indra/newview/app_settings/settings_per_account.xml, indra/newview/llimfloater.cpp, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/skins/default/xui/en/floater_im_container.xml: CHUI-105 WIP Implemented collapsed/expanded state transitions for messages and conversation panes. The states and dimensions of Conversations floater panes are saved in per account settings. [37c2bb7894be]

2012-05-15 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h:	CHUI-105 WIP Hide an additional close button for undocked state of	an IM floater [d3f76dc6fc27]

* indra/newview/llpanelimcontrolpanel.cpp, indra/newview/llpanelimcontrolpanel.h,	indra/newview/skins/default/xui/en/panel_group_control_panel.xml: CHUI-105 WIP Remove obsolete controls from the group's control pane [6536c50795e0]

* indra/newview/llpanelpeoplemenus.cpp, indra/newview/llparticipantlist.cpp: CHUI-102 WIP Implemented new context menu for ad-hoc and group conferences [3b077555efac]

2012-05-14 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llpanelimcontrolpanel.cpp, indra/newview/llpanelimcontrolpanel.h,	indra/newview/skins/default/xui/en/panel_im_control_panel.xml: CHUI-113 WIP clean-up (obsolete code was removed) [5b2c8e19b404]

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h:	Formatting fixes [0d648ecb16bf]

* indra/newview/llchathistory.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/llpanelimcontrolpanel.cpp, indra/newview/llpanelimcontrolpanel.h,	indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-113 WIP all voice controls is moved from a IM-control panel to	the IM floater; IMControlPanel is removed; simplified voice button's	listener behavior [39d010308eeb]

2012-05-10 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-105 WIP Added expand/collapse behavior for Conversations floater messages pane. [2c2091418e10]

2012-05-09 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llspeakers.h:	Removed a recursive include declaration [dedf8670840b]

2012-05-08 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/app_settings/settings.xml, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h,	indra/newview/llnearbychat.cpp, indra/newview/skins/default/xui/en/floater_im_session.xml, indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml: CHUI-103 FIXED Implemented switching text view modes from pop-up menu [4e1951a74352]

2012-05-07 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llui/llfloater.cpp, indra/newview/llimfloater.cpp, indra/newview/llimfloater.h, indra/newview/llimfloatercontainer.cpp, indra/newview/llimfloatercontainer.h,	indra/newview/skins/default/xui/en/floater_im_container.xml, indra/newview/skins/default/xui/en/floater_im_session.xml: CHUI-105 WIP Added tear-off and return behavior for IM floater. XUI changed for Converstions multifloater and IM floater. [021db78b4455]

2012-05-07 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/app_settings/settings.xml, indra/newview/llchathistory.cpp, indra/newview/llchathistory.h,	indra/newview/llimfloater.cpp: CHUI-103 WIP Added settings for switching text view mode [99b980bbc0cf]

* indra/newview/llchathistory.cpp, indra/newview/llchathistory.h:	CHUI-103 Repair drawing messages with prepend new line [d9dc13b88d71]

2012-05-04 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/llchathistory.cpp, indra/newview/skins/default/xui/en/strings.xml: CHUI-103 WIP Added support for showing/hiding timestamp and names, replacing own name with (You) [00a8a479379f]

2012-04-26 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/llpanelpeoplemenus.cpp, indra/newview/skins/default/xui/en/menu_people_groups.xml, indra/newview/skins/default/xui/en/menu_people_nearby.xml: CHUI-78 WIP Reordered and added missing items for People floater gear menus. [4197f81c1cdf]

2012-02-23 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/llmath/llcoord.h, indra/llui/llfloater.cpp, indra/llwindow/llwindow.cpp: Linux build fix. Moved type casts from protected base classes to derived LLCoord. [df3799412e77]

2012-04-26 Richard Linden  <Richard Linden>

* indra/llxuixml/llinitparam.h, indra/newview/llfolderviewitem.cpp, indra/newview/llimhandler.cpp, indra/newview/llnotificationgrouphandler.cpp, indra/newview/llnotificationhandler.h,	indra/newview/llnotificationofferhandler.cpp, indra/newview/llnotificationtiphandler.cpp, indra/newview/llviewerwindow.cpp, indra/newview/llviewerwindow.h:	post-merge build fixes [a90bf0371fa1]

* BuildParams, indra/llui/llmenugl.cpp, indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/llui/llui.cpp, indra/llxuixml/llinitparam.h,	indra/newview/CMakeLists.txt, indra/newview/llchiclet.cpp, indra/newview/llchiclet.h, indra/newview/llfloaterpreference.cpp, indra/newview/llfloatersidepanelcontainer.cpp, indra/newview/llfolderview.cpp, indra/newview/llfolderviewitem.cpp, indra/newview/llimhandler.cpp, indra/newview/llnearbychathandler.cpp, indra/newview/llnotificationalerthandler.cpp, indra/newview/llnotificationgrouphandler.cpp, indra/newview/llnotificationhandler.h,	indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationmanager.cpp, indra/newview/llnotificationmanager.h,	indra/newview/llnotificationofferhandler.cpp, indra/newview/llnotificationscripthandler.cpp, indra/newview/llnotificationtiphandler.cpp, indra/newview/llpanelpeople.cpp, indra/newview/llscreenchannel.cpp, indra/newview/llscreenchannel.h,	indra/newview/llviewerfloaterreg.cpp, indra/newview/llviewermenu.cpp, indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp, indra/newview/pipeline.cpp, indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml, indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml, indra /newview/skins/default/xui/en/menu_people_friends_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml, indra/newview/skins/default/xui/en/notifications.xml, indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml: merge with viewer-release [dd8ca59cd694]

* indra/newview/llfolderview.cpp, indra/newview/llfolderview.h,	indra/newview/llfolderviewitem.cpp, indra/newview/llpanelobjectinventory.cpp: CHUI-101 WIP Make LLFolderView general purpose removed hacks for object inventory folderview [cad6002d3116]

2012-04-25 Richard Linden  <Richard Linden>

* indra/llxuixml/llinitparam.h:	more gcc build fixes [4ab1cafc5fe6]

2012-04-24 Richard Linden  <Richard Linden>

* indra/llxuixml/llinitparam.h:	fix for gcc builds [980065782b88]

* indra/newview/llfloateroutbox.cpp, indra/newview/llnotificationhandler.h:	CHUI-96 FIX Cannot dismiss modal dialogs related to merchant outbox [c989bf5cf660]

* indra/llui/llnotificationtemplate.h,	indra/newview/skins/default/xui/en/notifications.xml: CHUI-106 FIX Notifications like Friends online are shown in local chat history - no toast given if chat history is open [b00ed56f3770]

* indra/llxuixml/llinitparam.h, indra/llxuixml/llxuiparser.cpp, indra/newview/llsyswellwindow.h:	CHUI-94 FIX Clicking OK on a notification does not remove the notification from the notifications listing [9b4f7fdd3bd8]

2012-04-23 AlexanderP ProductEngine  <apaschenko@productengine.com>

* indra/newview/skins/default/xui/en/floater_people.xml: CHUI-93 FIXED Increased People floater minimum width to avoid scroller on the tab container. [46abcf10fc3c]

2012-04-20 Richard Linden  <Richard Linden>

* indra/llxuixml/llinitparam.h:	more gcc fixes [240910e0dbd0]

* indra/newview/llchiclet.h:	CHUI-92 FIX Notification count is not shown on notification chiclet [81ca118b4f3c]

* indra/llxuixml/llinitparam.h:	fix for gcc builds [82c34eb2a63b]

* indra/llxuixml/llinitparam.h, indra/llxuixml/llxuiparser.cpp, indra/newview/llpreviewscript.cpp: allow nested modifier tags (e.g. Lazy, Atomic) in param block entries [d3523e82e945]

2012-04-18 Richard Linden  <Richard Linden>

* indra/newview/llhudobject.cpp, indra/newview/llhudobject.h:	converted to unix line endings [19a6af989b43]

2012-04-17 Richard Linden  <Richard Linden>

* indra/newview/llhudnametag.cpp: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [88fae47ae4a5]

* indra/newview/llhudnametag.cpp: CHUI-86 WIP Investigate voice-dot with name tag integration removed dead code [33dcd882b058]

* indra/llui/lluiimage.cpp: CHUI-86 WIP Investigate voice-dot with name tag integration fixed bad parameters in draw3d...name tags should display properly now [62c5ff4775a6]

2012-04-17 Todd Stinson  <stinson@lindenlab.com>

* indra/newview/llhudnametag.cpp: BUILDFIX: Attempting to correct a linux build problem. [c4dea04d72f5]

* indra/newview/llfollowcam.cpp, indra/newview/llhudobject.cpp, indra/newview/llhudobject.h, indra/newview/llvoavatar.cpp, indra/newview/llvoicevisualizer.cpp, indra/newview/llvoicevisualizer.h:	CHUI-86: Removing the LLHUDEffect parent class from the LLVoiceVisualizer. #ifdef'ing the code out for now, to be removed later. [64554d37372e]

2012-04-17 Richard Linden  <Richard Linden>

* indra/llui/llui.h:	fixed build [9f738218c1f4]

* indra/llui/llui.cpp, indra/llui/llui.h, indra/llui/lluiimage.cpp, indra/llui/lluiimage.h, indra/newview/llhudnametag.cpp: CHUI-86 WIP Investigate voice-dot with name tag integration added draw3D to LLUIImage to encapsulate display of image in projective 3D space [36999a2c74a0]

2012-04-17 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-91 ADDITIONAL_FIX Minor visual layout fixes. [75feff5df479]

2012-04-14 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/llui/llmenubutton.cpp, indra/llui/llmenugl.cpp, indra/llui/llmenugl.h: CHU-78 WIP Subtle cleanup. [4c9dd762825e]

* indra/newview/llpanelpeople.cpp, indra/newview/llpanelpeople.h,	indra/newview/skins/default/xui/en/panel_people.xml: CHUI-78 WIP Made the gear buttons spawn the avatar list context menu. [6c89dabbc240]

* indra/llui/llmenubutton.cpp, indra/newview/lllistcontextmenu.h: CHUI-78 WIP Minor cleanup. [45bc74015923]

* indra/newview/skins/default/xui/en/menu_people_friends_sort.xml, indra/newview/skins/default/xui/en/menu_people_friends_view.xml, indra/newview/skins/default/xui/en/menu_people_groups.xml, indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml, indra/newview/skins/default/xui/en/menu_people_nearby_view.xml, indra/newview/skins/default/xui/en/menu_people_recent_sort.xml, indra/newview/skins/default/xui/en/menu_people_recent_view.xml, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-78 WIP Re-combined view and sort menus in the People panel. [9853a70b4a5d]

* indra/newview/llpanelpeople.cpp, indra/newview/llpanelpeople.h,	indra/newview/skins/default/xui/en/panel_people.xml: CHUI-78 WIP Remove bottom button bar from the people panel.

By the way, removed the "Activate" button from the Groups tab. [14a162d0f50f]

2012-04-16 Richard Linden  <Richard Linden>

* indra/llxuixml/llinitparam.h:	more gcc build fixin [a10e21a11b2d]

2012-04-15 Richard Linden  <Richard Linden>

* indra/llxuixml/llinitparam.h:	another round of gcc fixes [e2ba0dc4feae]

* indra/llxuixml/llinitparam.h:	fixed minor typo [c6315b8f908f]

* indra/llui/llsdparam.cpp, indra/llxuixml/llinitparam.h:	attempted fix for gcc [9c180d72c030]

2012-04-13 Richard Linden  <Richard Linden>

* indra/llui/llui.cpp, indra/llui/llui.h, indra/llui/lluiimage.cpp, indra/llui/lluiimage.h, indra/llui/tests/llurlentry_stub.cpp, indra/llui/tests/llurlmatch_test.cpp, indra/llxuixml/llinitparam.h,	indra/llxuixml/llxuiparser.cpp, indra/newview/llvoavatar.cpp: fixed build all param values now support named values uniformly [8d9f8c0b0dbe]

* Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [40c006eb3254]

* indra/llxuixml/llinitparam.h, indra/llxuixml/llxuiparser.cpp: more LLInitParam cleanup cleaned up typedefs, and hid those that aren't part of the interface [a95c1abcd927]

2012-04-13 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/newview/llchathistory.cpp, indra/newview/llfloaterpreference.cpp, indra/newview/llfloatersidepanelcontainer.cpp, indra/newview/llpanelblockedlist.cpp, indra/newview/llpanelblockedlist.h, indra/newview/llpanelpeople.cpp, indra/newview/skins/default/xui/en/floater_people.xml, indra/newview/skins/default/xui/en/menu_people_friends_view.xml, indra/newview/skins/default/xui/en/menu_people_nearby_view.xml, indra/newview/skins/default/xui/en/menu_people_recent_view.xml, indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-91 FIXED Moved block list to a separate People floater tab. [c006fd0e944a]

2012-04-13 Richard Linden  <Richard Linden>

* indra/llui/llloadingindicator.h, indra/llxuixml/llinitparam.h:	renamed Lazy to Atomic [8cea01183d28]

2012-04-12 Richard Linden  <Richard Linden>

* indra/llxuixml/llinitparam.h:	attempted fix of gcc build [7a80e62b1c05]

* Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [1a1611a00e2c]

* indra/llui/llloadingindicator.cpp, indra/llui/llloadingindicator.h,	indra/llxuixml/llinitparam.h, indra/llxuixml/llxuiparser.cpp, indra/newview/llvoavatar.cpp: fixed UI not working at all due to bad param blocks [f0a3ce2edbeb]

2012-04-13 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/newview/llinspectavatar.cpp, indra/newview/skins/default/xui/en/inspect_avatar.xml: CHUI-90 WIP Added "View full profile" link to avatar inspectors. [d6e24c3ba460]

2012-04-12 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/newview/llinspectavatar.cpp, indra/newview/skins/default/xui/en/inspect_avatar.xml, indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml, indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml: CHUI-90 WIP Removed all buttons and menus from avatar inspectors. [f7f554b39c25]

2012-04-12 Richard Linden  <Richard Linden>

* indra/llui/tests/llurlentry_stub.cpp, indra/llui/tests/llurlmatch_test.cpp: fixed broken unit tests [cc780960e6d9]

2012-04-11 Richard Linden  <Richard Linden>

* indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h:	merge [cae43f02f508]

2012-04-06 Richard Linden  <Richard Linden>

* indra/llui/llsdparam.cpp, indra/llui/lluiimage.h,	indra/llxuixml/llinitparam.cpp, indra/llxuixml/llinitparam.h:	further LLInitParam cleanup changed bool template parameter to	IS_BLOCK and NOT_BLOCK types moved addParam to BlockDescriptor moved init outside of param element constructors for faster construction [b48909d20bee]

2012-04-05 Richard Linden  <Richard Linden>

* indra/llxuixml/llinitparam.h:	optimized Lazy<T> params - don't generate block when checking validity or merging [d978d774c4a7]

* indra/llxuixml/llinitparam.h:	added support for LLInitParam::Lazy to support lazy- initialized non-param-block values [0a91ec253e0d]

* indra/llxuixml/llinitparam.h, indra/llxuixml/llxuiparser.cpp, indra/llxuixml/llxuiparser.h, indra/newview/llhudnametag.cpp, indra/newview/llhudnametag.h, indra/newview/llspatialpartition.cpp, indra/newview/llviewermenu.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h, indra/newview/pipeline.cpp: CHUI-89 FIX Make nametags appear consistently next to avatar heads nametags now track avatar head avatar_skeleton now loaded as param block vector3 param block parsing support fixes for param block recursion [a502718efba4]

2012-04-11 William Todd Stinson  <stinson@lindenlab.com>

* BuildParams: Touching a file to get TC to build with the correct codeticket number on all platforms. [c6d03c60539e]

2012-04-11 Richard Linden  <Richard Linden>

* Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [9e9cd71975e7]

* indra/newview/llvoavatar.cpp: CHUI-89 FIX Make nametags appear consistently next to avatar heads tweaked nametag positioning [aa8831e63fd5]

2012-04-11 Todd Stinson  <stinson@lindenlab.com>

* BuildParams: Adding definitions for a project viewer for chui to more easily distinguish what is installed. [2a1d7ed1dfc5]

2012-04-10 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/newview/llpanelpeople.cpp, indra/newview/llpanelpeople.h,	indra/newview/skins/default/xui/en/panel_people.xml: CHUI-77 WIP Made per-tab filters work. [375e55396e37]

2012-04-06 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/newview/llpanelpeople.cpp, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-77 WIP Moved setting filter label to XML. [b5c5c9ad83f3]

2012-04-12 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/newview/CMakeLists.txt, indra/newview/llavataractions.cpp, indra/newview/llavataractions.h,	indra/newview/llfloatervoicevolume.cpp, indra/newview/llfloatervoicevolume.h,	indra/newview/llinspectavatar.cpp, indra/newview/lloutputmonitorctrl.cpp, indra/newview/lloutputmonitorctrl.h,	indra/newview/llviewerfloaterreg.cpp, indra/newview/skins/default/xui/en/floater_voice_volume.xml: CHUI-80 FIXED Implemented volume indicator pop-up.

It is invoked by clicking on any speaking indicator except yours. [e2c5fcb0ed01]

2012-04-11 Richard Linden  <Richard Linden>

* indra/newview/llvoavatar.h:	rolled back accidental merge of wip code [63dbea673f11]

* Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [9d81b61a92f9]

* indra/newview/llhudnametag.cpp, indra/newview/llhudnametag.h,	indra/newview/llspatialpartition.cpp, indra/newview/llviewermenu.cpp, indra/newview/llvoavatar.cpp, indra/newview/llvoavatar.h, indra/newview/pipeline.cpp: CHUI-89 FIX Make nametags appear consistently next to avatar heads [90d3e0f1f6cb]

2012-04-05 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/llui/llmenubutton.cpp, indra/newview/llpanelpeople.cpp, indra/newview/llpanelpeople.h,	indra/newview/skins/default/xui/en/menu_group_plus.xml, indra/newview/skins/default/xui/en/menu_people_friends_sort.xml, indra/newview/skins/default/xui/en/menu_people_friends_view.xml, ind ra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_groups_view.xml, indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml, indra/newview/skins/default/xui/en/menu_people_nearby_view.xml, indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml, indra/newview/skins/default/xui/en/menu_people_recent_sort.xml, indra/newview/skins/default/xui/en/menu_people_recent_view.xml, indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml, indra/newview/skins/default/xui/en/panel_people.xml: CHUI-78 WIP Added drop-down menus and connected callbacks to the new view/sort/add/remove buttons. [90198a1f68c6]

* indra/llui/llmenubutton.cpp, indra/llui/llmenubutton.h: CHUI-78 WIP Enabled LLMenuButton to manage its menu's lifetime. [c8335c1b2294]

* indra/llui/llmenubutton.cpp: CHUI-78 WIP Renamamed menu_button.position XUI attribute to menu_position for consistency with menu_filename. [7f4d6265a588]

2012-04-04 Vadim ProductEngine  <vsavchuk@productengine.com>

* indra/llui/llmenubutton.h:	CHUI-78 WIP Fixed parsing of menu_button.menu_position XUI parameter. [fa4e3c773979]

2012-04-05 Seth ProductEngine  <slitovchuk@productengine.com>

* indra/newview/skins/default/xui/en/panel_people.xml: CHUI-77 WIP People panel layout change: filter pane moved inside the tab. [ed3f106920f8]

2012-03-30 Richard Linden  <Richard Linden>

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/llui/llnotificationtemplate.h, indra/newview/llchiclet.cpp, indra/newview/llnotificationhandler.h,	indra/newview/llnotificationhinthandler.cpp, indra/newview/llscreenchannel.cpp: CHUI-51 WIP notifications routing code cleanup object inventory offers don't increment system menu count added customizable merging behavior for duplicate "unique" notifications fixed overeager notification channels [449cc695b109]

2012-03-29 Richard Linden  <Richard Linden>

* indra/newview/llchiclet.cpp, indra/newview/llnotificationmanager.cpp: Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui [28c3b859e6a9]

* indra/llcommon/llinstancetracker.h, indra/llcommon/llrefcount.h,	indra/llcommon/llthread.h, indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/llui/llnotificationslistener.cpp, indra/newview/llchiclet.cpp, indra/newview/llchiclet.h,	indra/newview/llfloaternotificationsconsole.cpp, indra/newview/llimhandler.cpp, indra/newview/llnotificationgrouphandler.cpp, indra/newview/llnotificationhandler.h,	indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationmanager.cpp, indra/newview/llnotificationmanager.h,	indra/newview/llnotificationofferhandler.cpp, indra/newview/llnotificationscripthandler.cpp, indra/newview/llsyswellwindow.cpp, indra/newview/llsyswellwindow.h,	indra/newview/lltoastgroupnotifypanel.h,	indra/newview/lltoastscripttextbox.h:	CHUI-51 WIP notifications routig code cleanup phase 2, removal of	extraneous signaling in favor of llnotificationchannels made notificationchannels work better with overrides and lifetime managed by creator [19205d39c7df]

2012-03-28 Richard Linden  <Richard Linden>

* indra/newview/llchiclet.cpp, indra/newview/llnotificationmanager.cpp: CHUI-51 WIP notifications routing code cleanup fixed crash on login [5f4f186d5128]

2012-03-27 Richard Linden  <Richard Linden>

* indra/llui/llnotifications.cpp, indra/llui/llnotifications.h,	indra/llui/llnotificationtemplate.h,	indra/newview/llbrowsernotification.cpp, indra/newview/llchiclet.cpp, indra/newview/llfloaternotificationsconsole.cpp, indra/newview/llfloateroutbox.cpp, indra/newview/llfloateroutbox.h,	indra/newview/llimhandler.cpp, indra/newview/llnearbychathandler.cpp, indra/newview/llnearbychathandler.h,	indra/newview/llnotificationalerthandler.cpp, indra/newview/llnotificationgrouphandler.cpp, indra/newview/llnotificationhandler.h,	indra/newview/llnotificationhandlerutil.cpp, indra/newview/llnotificationhinthandler.cpp, indra/newview/llnotificationmanager.cpp, indra/newview/llnotificationmanager.h,	indra/newview/llnotificationofferhandler.cpp, indra/newview/llnotificationscripthandler.cpp, indra/newview/llnotificationtiphandler.cpp, indra/newview/llscreenchannel.h, indra/newview/llsyswellwindow.cpp, indra/newview/lltoastgroupnotifypanel.cpp, indra/newview/lltoastgroupnotifypanel.h,	indra/newview/lltoastnotifypanel.cpp, indra/newview/lltoastnotifypanel.h,	indra/newview/llviewermessage.cpp, indra/newview/llviewerwindow.cpp, indra/newview/skins/default/xui/en/notifications.xml: CHUI-51 WIP notifications routig code cleanup phase 1, removal of	most of llnotificationhandler [1f11fe6c22ee]

2013-02-12 Oz Linden  <oz@lindenlab.com>

* .hgtags: pull back 3.4.5-release tag [543fd61e94cc]

2013-02-05 Oz Linden  <oz@lindenlab.com>

* .hgtags: merge changes for 3.4.5-beta5 [4e5419972eca]

2013-02-25 Nicky Perian  <nickyperian@yahoo.com>

* indra/llui/lltoolbar.cpp, indra/llui/lltoolbar.h,	indra/newview/lltoolbarview.cpp, indra/newview/lltoolbarview.h:	KOKUA #1200 correct right-click tool bar buutons do not bring up context menu. [3221ab6a9c4a]

2012-02-20 ziree

* indra/llui/lltoolbar.cpp, indra/llui/lltoolbar.h,	indra/newview/lltoolbarview.cpp, indra/newview/lltoolbarview.h,	indra/newview/skins/default/xui/en/menu_toolbars_horizontal.xml, indra/newview/skins/default/xui/en/menu_toolbars_vertical.xml: KOKUA #1200 Added top, bottom, center, left and right alignment options to toolbars. [71f568a11eff]

2013-02-20 Nicky Perian  <nickyperian@yahoo.com>

* .hgtags, indra/llcommon/llversionviewer.h,	indra/newview/viewerinfo.cpp: Merge back 3.4.6 [decfb59f82ba]

* indra/newview/viewerinfo.cpp: Set version to 3.4.6 [f68d03ae3e85]

* .hgtags: Added tag Kokua-3.4.6-start for changeset 299034b45247 [c1c824fbad9d]

2013-02-18 Nicky Perian  <nickyperian@yahoo.com>

* .hgtags: Added tag Kokua-3.4.5a for changeset 3e7f82e2c90f [299034b45247] [Kokua-3.4.6-start]

* indra/llcommon/llversionviewer.h, indra/newview/viewerinfo.cpp: Version to 3.4.5.25945 LL_CHANNEL to Kokua Release [3e7f82e2c90f] [Kokua-3.4.5a]