AlexanderP ProductEngine
|
f4c4df4cdd
|
fix incorrect merge
|
2012-08-10 17:39:46 +03:00 |
|
AlexanderP ProductEngine
|
a06256838c
|
build fix
|
2012-08-10 17:13:16 +03:00 |
|
AlexanderP ProductEngine
|
6cf49a4a71
|
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.
|
2012-08-09 16:48:33 +03:00 |
|
Todd Stinson
|
268d5bd4bd
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
|
2012-08-09 17:04:00 -07:00 |
|
Todd Stinson
|
ce417a01c9
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-08-09 15:40:35 -07:00 |
|
Todd Stinson
|
9488baada3
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-08-09 12:06:09 -07:00 |
|
Todd Stinson
|
de08d74dc6
|
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
|
2012-08-08 18:23:01 -07:00 |
|
Todd Stinson
|
2b026a8066
|
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.
|
2012-08-08 18:17:01 -07:00 |
|
Oz Linden
|
3379760965
|
merge changes for DRTVWR-189
|
2012-08-08 07:27:59 -07:00 |
|
Oz Linden
|
36e36b9497
|
tag merge of DRTVWR-189
|
2012-08-08 07:25:19 -07:00 |
|
Oz Linden
|
1ace064a58
|
Added tag DRTVWR-189 for changeset 9ee938778970
|
2012-08-08 05:26:57 -07:00 |
|
Oz Linden
|
261c10adf3
|
merge changes for DRTVWR-188
|
2012-08-07 19:42:45 -07:00 |
|
Oz Linden
|
fba9c9e8dd
|
tag merge of DRTVWR-188
|
2012-08-07 19:42:04 -07:00 |
|
Oz Linden
|
2571809dc0
|
tag merge of DRTVWR-181
|
2012-08-07 17:05:30 -07:00 |
|
Merov Linden
|
25855962a8
|
CHUI-98 : Isolate LLConversationItem and LLConversationViewModel in their own file
|
2012-08-06 18:07:56 -07:00 |
|
Todd Stinson
|
493d3b3651
|
PATH-842, VWR-29431: BUGFIX Correcting a regression introduced by the fix for PATH-542. The viewer calculated rotation resulting from an object's angular velocity was being incorrectly reset when the corresponding object update was received. With this bugfix, the rotation resulting from the angular velocity is accumulated separately and is re-appplied when the object update resets the object's rotation.
|
2012-08-06 17:08:57 -07:00 |
|
Gilbert Gonzales
|
02bdceb580
|
Linux compiliation fix, needed to create DirtyFilterFunctor outside of function parameter so that it can be legally passed as a reference.
|
2012-08-06 14:08:14 -07:00 |
|
Gilbert Gonzales
|
aa011b98e3
|
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.)
|
2012-08-06 11:59:54 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
09cb8a4780
|
Merge with lindenlab/viewer-development
|
2012-08-03 10:20:47 -07:00 |
|
AlexanderP ProductEngine
|
3b525b788d
|
CHUI-241 (Add drag handle in UI to resize width of conversations list): implemented drag handle via predefined params of layout panels
|
2012-08-03 18:02:28 +03:00 |
|
Richard Linden
|
118e3b33bd
|
CHUI-270 FIX Progress spinner not visible in merchant outbox
|
2012-08-03 17:43:48 -07:00 |
|
Richard Linden
|
a831cb5bee
|
CHUI-273 FIX Inventory filtering changes not showing when changes are selected
|
2012-08-03 15:56:12 -07:00 |
|
Richard Linden
|
06e1887f2f
|
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
|
2012-08-03 15:23:24 -07:00 |
|
Richard Linden
|
af8d113557
|
CHUI-271 FIX Items that are cut and then removed from the clipboard without paste do not show in Trash until relog
|
2012-08-03 15:23:08 -07:00 |
|
Merov Linden
|
c66164d4b4
|
Pull merge from richard/viewer-chui.
|
2012-08-03 13:55:34 -07:00 |
|
Merov Linden
|
d6d35d970f
|
CHUI-263 : Fix crash on exit. LLSingleton like LLConversationLog cannot be an LLFriendObserver at the same time.
|
2012-08-03 13:54:35 -07:00 |
|
Gilbert Gonzales
|
291e787323
|
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.
|
2012-08-03 11:56:19 -07:00 |
|
Richard Linden
|
c43eedd434
|
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
|
2012-08-02 20:47:02 -07:00 |
|
Richard Linden
|
faac868b68
|
CHUI-223 FIX Selecting to cut an inventory item causes all open inventory windows to refresh
|
2012-08-02 20:45:52 -07:00 |
|
Todd Stinson
|
ae2de6bdcf
|
Re-enabling the voice-dot until I have more time to invest in the new CHUI version.
|
2012-08-02 18:38:38 -07:00 |
|
Todd Stinson
|
3e610d3015
|
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
|
2012-08-02 17:27:51 -07:00 |
|
Todd Stinson
|
c44aa1c966
|
CHUI-262: Reordering the steps to remove a view item and view item model during the deletion process to avoid a crash.
|
2012-08-02 17:26:09 -07:00 |
|
Seth ProductEngine
|
4e7c2c6942
|
CHUI-228 FIX Inventory object creation date initialized with 0 to avoid some folders reporting wrong creation date.
|
2012-08-02 22:49:42 +03:00 |
|
Gilbert Gonzales
|
1728eca264
|
merge changes
|
2012-08-02 11:07:52 -07:00 |
|
Oz Linden
|
7fa426f4db
|
tag merge of DRTVWR-186
|
2012-08-02 13:09:39 -04:00 |
|
Gilbert Gonzales
|
a87b27c41d
|
merging of latest code
|
2012-08-02 09:45:59 -07:00 |
|
AlexanderP ProductEngine
|
0fa1e2b9ae
|
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
|
2012-08-02 18:43:44 +03:00 |
|
Richard Linden
|
88e81f9929
|
CHUI-223 WIP Selecting to cut an inventory item causes all open inventory windows to refresh
avoid moving selection when cutting
|
2012-08-01 20:07:42 -07:00 |
|
Richard Linden
|
c009cf4f76
|
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
|
2012-08-01 19:42:22 -07:00 |
|
Gilbert Gonzales
|
1d6957ce09
|
merge of latest changes
|
2012-08-01 17:36:46 -07:00 |
|
Gilbert Gonzales
|
c6d981a843
|
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.
|
2012-08-01 17:29:34 -07:00 |
|
eli
|
f7861f2828
|
FIX INTL-100 Frrench linguistic fixes
|
2012-08-01 16:21:58 -07:00 |
|
Richard Linden
|
898ec6cd36
|
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
|
2012-08-01 14:44:29 -07:00 |
|
eli
|
46f10dccb6
|
sync with viewer-dev for 'fr'
|
2012-08-01 13:40:39 -07:00 |
|
eli
|
4376848e15
|
sync with viewer-dev for 'ja'
|
2012-08-01 13:38:21 -07:00 |
|
eli
|
634756de49
|
sync with viewer-dev for changes and new files for 'en'
|
2012-08-01 13:23:10 -07:00 |
|
eli
|
429726a1dd
|
sync with viewer-dev, removing obsolete files
|
2012-08-01 13:20:43 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
92a0db2a4f
|
Merge MAINT-1270 fix
|
2012-08-01 13:17:35 -07:00 |
|
AlexanderP ProductEngine
|
4cb1e766fc
|
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.
|
2012-08-01 21:08:42 +03:00 |
|
Richard Linden
|
4256b54ee7
|
build fix
|
2012-08-01 10:45:11 -07:00 |