Commit Graph

23862 Commits (0479e8d4ad1212b0028805cd4e39b6fe593b86c7)

Author SHA1 Message Date
Todd Stinson 0479e8d4ad Updating comments for merge conflicts after reviewing with Richard. 2012-07-27 14:28:31 -07:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Paul ProductEngine f82d0b1719 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
2012-07-27 17:51:40 +03:00
Paul ProductEngine e9f640a26f CHUI-198 FIXED (Hitting minimize option on conversations floater closes floater, not minimize)
- Removed code which was hiding floater on minimizing floater.
2012-07-27 17:36:41 +03:00
Todd Stinson e97d0f4195 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-07-26 18:59:27 -07:00
Todd Stinson 1e65ba1f90 CHUI-251: Adding back in the root 'Contents' folder under the Build floater Content tab. 2012-07-26 18:57:54 -07:00
Todd Stinson 5221e48ef6 CHUI-251: Resetting the object inventory panel after deleting the last object. 2012-07-26 17:26:27 -07:00
Richard Linden 797825a222 Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui 2012-07-26 16:30:53 -07:00
Richard Linden 779d982717 made Deprecated params write-only 2012-07-26 16:30:27 -07:00
Richard Linden e2e0003dea Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui 2012-07-25 22:50:28 -07:00
Richard Linden 88f259f7c1 optimization of LLSD param parsing 2012-07-25 20:08:17 -07:00
Richard Linden 69b57d4ac0 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
2012-07-25 19:54:39 -07:00
Richard Linden f6dfd6bf0f CHUI-222 FIX Selecting None in inventory filters does not update until inventory selected 2012-07-25 18:20:54 -07:00
Richard Linden c4f59fd588 CHUI-239 FIX Viewer crash when opening object with contents 2012-07-25 14:30:17 -07:00
AlexanderP ProductEngine de8cd534b9 CHUI-230 [FIXED] Torn off conversation window size resizes when viewer window is resized 2012-07-25 16:16:06 +03:00
Richard Linden 891a09561d 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
2012-07-24 20:29:20 -07:00
Richard Linden 1736c7b74e Backed out changeset: a20e437a726c 2012-07-24 15:19:18 -07:00
Gilbert Gonzales decd8a435d 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. 2012-07-24 14:42:28 -07:00
Seth ProductEngine f303eeccf7 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.
2012-07-24 22:47:35 +03:00
Richard Linden 0a28a63ce0 fix for gcc builds 2012-07-24 12:03:00 -07:00
Richard Linden 310ebe90a9 Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui 2012-07-23 19:34:10 -07:00
Richard Linden 176b7d82be 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
2012-07-23 19:33:39 -07:00
Oz Linden 3645669241 Added tag 3.3.4-release for changeset 28e100d0379a 2012-07-23 16:05:14 -04:00
AlexanderP ProductEngine 3ae21b429e CHUI-207 FIXED Emptying Lost and Found and Trash in inventory crashes viewer 2012-07-20 17:16:22 +03:00
AlexanderP ProductEngine 7c9be0e3de CHUI-229 [FIXED] Nearby chat conversation does not appear initially in conversation list if no other conversations are present 2012-07-19 15:11:56 +03:00
AlexanderP ProductEngine 6227a5c273 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 2012-07-19 19:16:36 +03:00
Merov Linden efa73d4975 CHUI-236 : WIP : Places panel works for My Inventory but still empty lists for Favorites Bar, My Landmarks and Library. 2012-07-19 20:38:07 -07:00
merov_linden 15f6f877f9 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. 2012-07-19 03:57:24 +01:00
Oz Linden 9643dee27e Added tag 3.3.4-beta5 for changeset ab2ffc547c8a 2012-07-18 05:41:55 -07:00
Oz Linden f26dfe4fb9 merge changes for DRTVWR-184 2012-07-18 03:10:25 -04:00
Oz Linden a93cb07df6 tag merge of DRTVWR-184 2012-07-18 03:09:09 -04:00
Merov Linden be53b31fed Merge pull from richard/viewer-chui 2012-07-17 12:08:13 -07:00
Merov Linden ec4d1a2450 CHUI-234 : Fix crashers in landmarks panel 2012-07-17 12:07:25 -07:00
Dave Parks 636e20be10 MAINT-1223 More aggressive rebuilding of render batches when alpha color values change. 2012-07-17 13:00:33 -05:00
Oz Linden c906d64004 Added tag 3.3.4-beta4 for changeset 6c75f220b103 2012-07-17 13:18:12 -04:00
Oz Linden e49faf96aa merge changes for DRTVWR-183 2012-07-17 12:16:37 -04:00
Oz Linden 291be17078 tag merge of DRTVWR-183 2012-07-17 12:16:22 -04:00
AlexanderP ProductEngine b3ca0b09dc Fixed positioning of conversations into container 2012-07-17 16:43:48 +03:00
Dave Parks ccac47c1a7 MAINT-1223 Fix for alpha updates not triggering LoD updates. 2012-07-16 14:31:15 -05:00
Oz Linden a4df79bcdc tag merge of DRTVWR-180 2012-07-14 08:50:13 -04:00
AlexanderP ProductEngine 8fd35a0a08 CHUI-207 FIXED cancellation of removal of the object that has already been removed 2012-07-13 16:30:33 +03:00
AlexanderP ProductEngine 56277fa43c CHUI-206 FIXED Viewer crash when selecting to cut inventory item, then selecting to cut another inventory item 2012-07-13 20:24:44 +03:00
Seth ProductEngine 7f7a9b7cba CHUI-205 FIXED conversations selection in the conversations list.
Each conversation item is added to the folder view which lists all conversations.
2012-07-13 20:06:35 +03:00
Dave Parks f5254d532b MAINT-1262 Fix for crash when setting graphics to Low 2012-07-12 16:53:31 -05:00
AlexanderP ProductEngine af7de5dd93 CHUI-170 Workaround for the permanently showing of the nearbychat's name in a conversations list when that floater is torn-off 2012-07-12 19:06:29 +03:00
AlexanderP ProductEngine 6dff1477d5 CHUI-199 FIXED Save positioning of conversations between sessions 2012-07-12 16:36:01 +03:00
Dave Parks 997b360747 MAINT-794 Fix for assert on loading some types of objects before their parents. 2012-07-11 15:17:13 -05:00
Seth ProductEngine aafbf0d213 CHUI-203 FIXED Conversations floater resizing when it is opened with FUI Chat button. 2012-07-11 17:19:22 +03:00
Merov Linden 5db5e86f41 Pull from richard/viewer-chui 2012-07-10 10:59:23 -07:00
Seth ProductEngine b203fe12f8 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.
2012-07-10 16:49:49 +03:00