5c9dd94e19
BOOL vs bool FIGHT
2012-12-14 21:41:02 +00:00
0182eb11f7
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-12-14 11:04:55 -08:00
07dd6cf67e
merge changes for DRTVWR-224
2012-12-14 12:57:05 -05:00
d3293be2fe
tag merge of DRTVWR-224
2012-12-14 12:56:58 -05:00
22c2fff4ba
CHUI-566 Flashing and color on Conversations FUI button and conversation line item
2012-12-14 19:56:05 +02:00
70ea607842
merge
2012-12-14 11:21:37 +02:00
08cc82ec48
CHUI-599 : Fixed : Avatar name provides now a method to get the regular account name.
2012-12-13 22:45:47 -08:00
3a72577f39
Fixes from Oz's merge.
2012-12-13 18:27:32 -08:00
94694be6b5
Pull merge from richard/viewer-chui
2012-12-13 18:04:47 -08:00
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
179ab5c735
CHUI-595, CHU-554: Updating the people panel to new specs.
2012-12-13 15:54:49 -08:00
83299b56c4
merge fixes from 3.4.3-beta3
2012-12-13 18:18:39 -05:00
9f1b484817
Added tag 3.4.3-beta3 for changeset 870e2d79e006
2012-12-13 18:10:21 -05:00
d0eff20718
merge changes for DRTVWR-267
2012-12-13 17:12:34 -05:00
b7ac7a0797
tag merge of DRTVWR-267
2012-12-13 17:12:31 -05:00
8e99b82645
merge changes for DRTVWR-244
2012-12-13 15:29:07 -05:00
e2bd5f7a9d
tag merge of DRTVWR-244
2012-12-13 15:29:01 -05:00
2282d6b11a
Fixed whitespace issues for merge.
2012-12-13 12:24:17 -08:00
c4c73fbcc6
merge changes for DRTVWR-266
2012-12-13 14:57:40 -05:00
35ef55b63f
tag merge of DRTVWR-266
2012-12-13 14:57:36 -05:00
874917106b
Removed tag 3.4.3-release
2012-12-13 14:38:18 -05:00
83a95325f8
merge changes for DRTVWR-265
2012-12-13 14:37:54 -05:00
ef07952d0d
tag merge of DRTVWR-265
2012-12-13 14:37:50 -05:00
fa822a2ae5
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
2012-12-13 11:17:07 -08:00
00ebeaba58
Fix line endings.
2012-12-13 11:14:16 -08:00
177737fa34
merging in latest changes
2012-12-13 09:14:51 -08:00
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
be6f3286f4
Fixed path for correct assembly of the project
2012-12-13 18:43:52 +02:00
5df9d52d48
CHUI-499: Refactoring the persistent notification storage so that I can reuse the functionality for do-not-disturb mode.
2012-12-12 18:49:07 -08:00
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
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
2a9056f0b7
merging in latest changes
2012-12-12 17:00:35 -08:00
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
5b827d58f6
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
2012-12-12 14:24:09 -08:00
e90bd165c8
CHUI-589 (Conversation floater displays wrong IM floater when receiving a new message)
...
additional fix
2012-12-12 23:35:52 +02:00
a88de5d45f
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge.
2012-12-12 13:16:45 -08:00
0a16fc53cf
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge.
2012-12-12 12:53:24 -08:00
78b7a4b37c
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-12-12 12:48:59 -08:00
e7a912816e
mergining in latest changes
2012-12-12 10:40:47 -08:00
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
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
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
773c4abc81
MAINT-2082: fix deletion of an autoreplace list
2012-12-12 10:53:13 -05:00
66fee67397
MAINT-2051: Implement replacement of an existing autoreplace list
2012-12-12 09:22:14 -05:00
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
3636b10d47
CHUI-494: Removing the creation of a new session while receiving an IM in DND mode.
2012-12-11 20:46:10 -08:00
79cb158e11
Removing cruft code.
2012-12-11 20:03:05 -08:00
9c145d88a6
CHUI-589 (Conversation floater displays wrong IM floater when receiving a new message)
2012-12-12 05:46:56 +02:00
b5db495259
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.
2012-12-11 18:48:29 -08:00
b4e738e503
merging in latest changes
2012-12-11 17:51:00 -08:00
Aura Linden