William Todd Stinson
d0dbdac41d
CHUI-549: Updating the conversations floater according to specs.
2012-12-14 17:00:00 -08:00
William Todd Stinson
56b23a8727
CHUI-554: Updating the people panel according to specs.
2012-12-14 14:25:49 -08:00
William Todd Stinson
bede028c51
CHUI-595: Updating the people panel according to specs.
2012-12-14 14:17:53 -08:00
William Todd Stinson
0182eb11f7
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-12-14 11:04:55 -08:00
MaximB ProductEngine
70ea607842
merge
2012-12-14 11:21:37 +02:00
Merov Linden
08cc82ec48
CHUI-599 : Fixed : Avatar name provides now a method to get the regular account name.
2012-12-13 22:45:47 -08:00
Merov Linden
94694be6b5
Pull merge from richard/viewer-chui
2012-12-13 18:04:47 -08:00
Merov Linden
569701cfc8
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.
2012-12-13 17:15:18 -08:00
William Todd Stinson
179ab5c735
CHUI-595, CHU-554: Updating the people panel to new specs.
2012-12-13 15:54:49 -08:00
Oz Linden
9f1b484817
Added tag 3.4.3-beta3 for changeset 870e2d79e006
2012-12-13 18:10:21 -05:00
Oz Linden
d0eff20718
merge changes for DRTVWR-267
2012-12-13 17:12:34 -05:00
Oz Linden
b7ac7a0797
tag merge of DRTVWR-267
2012-12-13 17:12:31 -05:00
Oz Linden
c4c73fbcc6
merge changes for DRTVWR-266
2012-12-13 14:57:40 -05:00
Oz Linden
35ef55b63f
tag merge of DRTVWR-266
2012-12-13 14:57:36 -05:00
Oz Linden
874917106b
Removed tag 3.4.3-release
2012-12-13 14:38:18 -05:00
Oz Linden
83a95325f8
merge changes for DRTVWR-265
2012-12-13 14:37:54 -05:00
Oz Linden
ef07952d0d
tag merge of DRTVWR-265
2012-12-13 14:37:50 -05:00
Kelly Washington
00ebeaba58
Fix line endings.
2012-12-13 11:14:16 -08:00
Gilbert Gonzales
177737fa34
merging in latest changes
2012-12-13 09:14:51 -08:00
Kelly Washington
70c6b08595
MAINT-1995 Names of banned and allowed residents are not shown in Access tab of the About Land dialog
...
Code by Richard, reviewed by merov and kelly
2012-12-13 08:44:22 -08:00
AlexanderP ProductEngine
be6f3286f4
Fixed path for correct assembly of the project
2012-12-13 18:43:52 +02:00
Gilbert Gonzales
b6f3c4d07e
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).
2012-12-12 18:02:13 -08:00
Gilbert Gonzales
37e95e8379
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.
2012-12-12 17:43:15 -08:00
Gilbert Gonzales
2a9056f0b7
merging in latest changes
2012-12-12 17:00:35 -08:00
Gilbert Gonzales
89671fa1ad
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.
2012-12-12 16:59:57 -08:00
MaximB ProductEngine
e90bd165c8
CHUI-589 (Conversation floater displays wrong IM floater when receiving a new message)
...
additional fix
2012-12-12 23:35:52 +02:00
William Todd Stinson
a88de5d45f
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge.
2012-12-12 13:16:45 -08:00
William Todd Stinson
78b7a4b37c
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-12-12 12:48:59 -08:00
Gilbert Gonzales
e7a912816e
mergining in latest changes
2012-12-12 10:40:47 -08:00
AlexanderP ProductEngine
4c20cc3e46
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
2012-12-12 18:53:06 +02:00
AlexanderP ProductEngine
322fb00630
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.
2012-12-12 19:05:40 +02:00
AlexanderP ProductEngine
9275379e3c
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
2012-12-12 18:59:24 +02:00
Oz Linden
773c4abc81
MAINT-2082: fix deletion of an autoreplace list
2012-12-12 10:53:13 -05:00
Oz Linden
66fee67397
MAINT-2051: Implement replacement of an existing autoreplace list
2012-12-12 09:22:14 -05:00
maxim@mnikolenko
3d7aaaada8
CHUI-427 FIXED Added callback to track changing in mUserPTTState. It's needed to synchronize both buttons
2012-12-12 13:14:52 +02:00
MaximB ProductEngine
9c145d88a6
CHUI-589 (Conversation floater displays wrong IM floater when receiving a new message)
2012-12-12 05:46:56 +02:00
Gilbert Gonzales
b4e738e503
merging in latest changes
2012-12-11 17:51:00 -08:00
Gilbert Gonzales
34558181c7
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.
2012-12-11 17:49:43 -08:00
MaximB ProductEngine
8037b43588
merge
2012-12-12 03:06:10 +02:00
MaximB ProductEngine
80bc7e13e1
CHUI-557 (Cannot expand conversation from minimized state by clicking on selected conversation)
2012-12-12 03:05:32 +02:00
maxim@mnikolenko
13956ab25d
CHUI-572 FIXED Changed initial position for floaters according to screenshot.
2012-12-11 17:16:32 +02:00
maxim@mnikolenko
6b1ab1b81c
CHUI-587 FIXED Disable menu item if "KeepConversationLogTranscripts" is false.
2012-12-11 15:20:46 +02:00
MaximB ProductEngine
0e4c3070cb
merge
2012-12-10 22:48:12 +02:00
Oz Linden
a334f41f8e
Added tag 3.4.3-release for changeset 5cba5f39d0a8
2012-12-10 15:24:49 -05:00
Oz Linden
623a06aabd
merge release tag
2012-12-10 15:24:08 -05:00
MaximB ProductEngine
f49d47b304
CHUI-394 (Group moderation tools missing in right click menus)
2012-12-10 17:22:56 +02:00
maxim@mnikolenko
08a7f4193b
CHUI-457 FIXED Brought back the checking
2012-12-10 15:30:46 +02:00
Merov Linden
53471178fe
CHUI-509, CHUI-585 : Fixed : Add font color parameters to received items and other inventory elements created
2012-12-07 20:06:30 -08:00
Merov Linden
79b44fa561
Pull merge from richard/viewer-chui
2012-12-07 19:00:35 -08:00
Merov Linden
a6f1690128
CHUI-580, CHUI-406 : Fixed : Finished avatar name caching, also fixed the display of (waiting) when names don't come (mostly in legacy mode).
2012-12-07 18:58:52 -08:00