livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,673 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

25673 Commits (e775e95416234f9a6abdb00a792b8ba392eeb607)

Author SHA1 Message Date
Gilbert Gonzales e775e95416 merging in latest changes 2012-11-15 15:45:02 -08:00
Gilbert Gonzales d3474c6eaf 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. 2012-11-15 15:42:22 -08:00
maksymsproductengine 37d7f46905 CHUI-524: The root reason of crash was in the infinity recursion in the chain of calls LLFloater::setFocus->LLFloater::setFrontmost->LLFloaterView::bringToFront. And problem was not related to CHUI-362. Reviewed by Stinson. 2012-11-15 15:32:02 -08:00
William Todd Stinson e89616aac8 Backed out changeset: 80bab29003f8 Removing hack fix for CHUI-524. 2012-11-15 15:11:22 -08:00
William Todd Stinson 70b9dd6ee6 CHUI-524: FIX Removing a function call that results in a circular logic loop and an eventual stack overflow crash. 2012-11-15 10:41:53 -08:00
MaximB ProductEngine ed202aaad5 merging into latest changes 2012-11-15 18:49:09 +02:00
MaximB ProductEngine dbc37f6ca7 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
 2012-11-15 10:38:21 +02:00
maksymsproductengine 7a088e9b2c CHUI-501 FIXED Add link to Privacy tab from Comms floater 2012-11-14 19:39:50 +02:00
William Todd Stinson ad84656016 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-14 11:20:29 -08:00
maxim_productengine 4094972434 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.
 2012-11-14 15:28:05 +02:00
Oz Linden a7a61adb29 Added tag 3.4.2-beta4 for changeset 73b84b9864dc 2012-11-14 06:34:26 -05:00
Oz Linden dec9979af0 tag merge of DRTVWR-243 2012-11-13 21:34:01 -05:00
Gilbert Gonzales d75824d520 CHUI-486: Post code review changes for last submit, just added in some parenthesis for conditional statements, thus making them more clear. 2012-11-13 16:45:56 -08:00
William Todd Stinson 951b4c3efb MAINT-1890: Adding a more descriptive comment to this hack fix for future reference. 2012-11-13 15:23:15 -08:00
William Todd Stinson 3d21b2302b MAINT-1891: FIX Updating the LLPipeline::clearRebuildGroups() to preserve HUD groups. clearRebuildGroups() is called during the teleport process. In the previous state, HUD objects were being incorrectly removed from the rebuild groups during the teleport process. This change will preserve HUD groups and should resolve this issue. 2012-11-13 15:16:26 -08:00
maksymsproductengine df1fd5d4bb CHUI-508 FIXED Attach to and Attach to HUD menus not showing in inventory floater to select attachment point 2012-11-14 00:07:46 +02:00
Gilbert Gonzales 39d46d2178 merging in latest changes 2012-11-13 11:20:33 -08:00
AlexanderP ProductEngine 29e9f792bb 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 2012-11-13 21:20:05 +02:00
Gilbert Gonzales 5a31b5dcea 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. 2012-11-13 11:19:45 -08:00
maxim_productengine aa2640f13a CHUI-447 FIXED Set session name as avatar's display name, if session is created by getting new message. 2012-11-13 14:04:14 +02:00
maxim_productengine 6ba822c0ff CHUI-460 FIXED Reselect floater after toggling the participant list open or closed 2012-11-13 13:32:24 +02:00
William Todd Stinson c137b645b6 MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring the sUpdateDelay value and simply updating all flexi-prims. This change most likely reduces frame rate. 2012-11-12 19:35:34 -08:00
Gilbert Gonzales 91781df370 CHUI-486: Now toasts only appear when proper 'Chat Preference' setting is set to 'Pop Up Message'. 2012-11-12 18:18:34 -08:00
William Todd Stinson 93995ada05 MAINT-1894: FIX This *should* fix a crash in the LLVolume::resizePath() method. The callstacks indicated that the std library was throwing a length exception on the std::vector::resize() call. Most likely cause was that the recent changes for flexi-prims were causing the mRenderRes to become negative. And thus, the 1<<mRenderRes calculation was generating a really large value for num_render_sections. 2012-11-12 15:27:56 -08:00
Gilbert Gonzales 0e6139eb3d merging in latest changes 2012-11-12 12:58:28 -08:00
William Todd Stinson 7833ecb580 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-11-12 10:36:21 -08:00
AlexanderP ProductEngine ab5a0a1d4d 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" 2012-11-12 15:06:42 +02:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
Gilbert Gonzales 6f53b5baeb merging in latest changes 2012-11-09 17:01:20 -08:00
Gilbert Gonzales f429decb0c CHUI-486: Now the new chat preferences in drop down lists and checkboxes are storable. These values are accessible globally using gSavedSettings. 2012-11-09 17:00:43 -08:00
William Todd Stinson 1786a7150e CHUI-517: Updating the copy for the avatar in-world name bubble status for Do Not Disturb mode. 2012-11-09 16:16:06 -08:00
William Todd Stinson 908f8735d4 CHUI-517: Updating the copy in Preferences for Do Not Disturb mode. 2012-11-09 16:09:06 -08:00
William Todd Stinson 312cb2ab61 Cleaning up white-space in an xml file. 2012-11-09 15:53:58 -08:00
William Todd Stinson 873057a21a CHUI-517: Updating notification copy for Do Not Disturb mode. 2012-11-09 15:45:07 -08:00
William Todd Stinson 69f81d5bb6 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. 2012-11-09 14:58:37 -08:00
William Todd Stinson 4f58b4088a 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. 2012-11-09 14:41:50 -08:00
Oz Linden 8a3384adaf Added tag 3.4.2-beta3 for changeset 710785535362 2012-11-09 16:16:03 -05:00
maxim_productengine 5790565ec6 Additional fix for CHUI-473 2012-11-09 19:44:37 +02:00
AlexanderP ProductEngine 3d42133ecb 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 2012-11-09 17:04:21 +02:00
Oz Linden a1270b0ba2 tag merge of DRTVWR-242 2012-11-09 09:25:56 -05:00
AlexanderP ProductEngine 2813e49d19 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) 2012-11-09 15:13:52 +02:00
maksymsproductengine 8283747496 CHUI-386 FIXED Vertical scrollbar not fully showing in conversation message panel 2012-11-12 16:25:35 +02:00
Merov Linden 99181a9777 CHUI-479 : WIP : Fixed the missing agent appearance in torn off dialogs by adding a consistency check and rebuild. 2012-11-09 19:06:00 -08:00
Merov Linden 04e84eb826 Pull merge from viewer-chui 2012-11-09 17:24:47 -08:00
Merov Linden ff1dab1792 CHUI-450 : Fixed how the list of speakers is updated, always add the agent avatar in it, takes voice activation into account 2012-11-09 17:19:03 -08:00
AlexanderP ProductEngine 486bdf3284 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
 2012-11-09 12:45:36 +02:00
William Todd Stinson 45336ca20d MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to fix these issues, but then was accidentally re-introduced during a bad merge. 2012-11-08 17:37:01 -08:00
Merov Linden 3d70cca702 Pull merge from richard/viewer-chui. 2012-11-08 17:15:44 -08:00
Merov Linden 1d590cd5fd CHUI-464, CHUI-466, CHUI-474 : Fixed! Better, unified and more consistent use of refreshConversation() to update torn off dialogs. 2012-11-08 17:09:23 -08:00
William Todd Stinson 5aa5a77af6 CHUI-516: Correcting crash when receiving a god-like teleport lure request while in do-not-disturb mode. 2012-11-08 15:15:27 -08:00