Leslie Linden
accf833945
EXP-1805 FIX -- Block calling cards from being added to Merchant Outbox
...
EXP-1810 PROGRESS -- Cannot resize Received items panel in Inventory window
* Updated "copy to merchant outbox" context menu and drag and drop code to block calling cards.
* Changed user_resize to true on the "Received Items" panel and the main inventory panel
2012-01-17 13:07:57 -08:00
Richard Linden
2589a7e135
fix for crash in assert when programmatically toggling user resize
2012-01-17 12:17:03 -08:00
Richard Linden
37593f276c
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
2012-01-17 12:05:23 -08:00
Richard Linden
facb0fa42c
merge with viewer-development
2012-01-17 11:55:19 -08:00
Leslie Linden
944814941d
Latest from viewer-dd
2012-01-17 11:46:05 -08:00
Leslie Linden
3a313469c9
EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in Inventory
...
* Updated context menu code to enable visible items that aren't explicitly disabled.
2012-01-17 11:44:40 -08:00
Leslie Linden
dc0573be6c
Merge with viewer-dd, attempt #1
2012-01-17 11:07:11 -08:00
Debi King (Dessie)
0915ce7834
reconciled .hgtags
2012-01-17 13:37:28 -05:00
Debi King (Dessie)
613d0fe42f
reconciled .hgtags
2012-01-17 13:35:09 -05:00
Debi King (Dessie)
cd64ae7fb8
reconciled .hgtags
2012-01-17 13:33:19 -05:00
Brad Payne (Vir Linden)
a7b642d358
merge
2012-01-17 13:31:48 -05:00
Debi King (Dessie)
2abb1a81c5
Added tag DRTVWR-105_3.2.5-release, 3.2.5-release for changeset c6175c955a19
2012-01-17 13:31:00 -05:00
Debi King (Dessie)
74737fa319
Added tag DRTVWR-109_3.2.6-beta1, 3.2.6-beta1 for changeset 286d73ff5c19
2012-01-17 13:26:35 -05:00
Leslie Linden
577479a3e5
EXP-1803 CLEAN-UP -- Modified code to use the "unique" tag on the notification.
2012-01-17 09:36:14 -08:00
Merov Linden
1f9529c0c2
EXP-1772 : Suppress a useless and confusing assert in destructor, called cleanup in there instead.
2012-01-17 08:55:19 -08:00
Merov Linden
64ff5a5213
Pull from viewer-experience
2012-01-17 07:39:51 -08:00
Oz Linden
64c45cbd1a
increment viewer version to 3.2.8
2012-01-17 10:39:14 -05:00
Merov Linden
0e7956a4cb
EXP-1758 : Fix crash on login on Mac (bad pointer reference). Might need more work if the intent was to always get that pointer.
2012-01-17 07:39:14 -08:00
Oz Linden
6157386b4c
Added tag 3.2.7-start for changeset 4891c46a56fe
2012-01-17 10:38:59 -05:00
Oz Linden
323d27ebcb
merge changes for vmrg-216
2012-01-17 10:36:04 -05:00
Paul ProductEngine
83138403ec
EXP-1768 FIXED (incomplete sentence for translation)
...
The whole sentence was split to two parts:
First pars was in panel.string and the second one in the text box. I combined them both in "allow_label5" text box and also I deleted unnecessary panel.string with the first part of the sentence.
2012-01-17 13:40:35 +02:00
Merov Linden
7092a07045
Fix Mac build issue
2012-01-16 14:35:00 -08:00
Jonathan Yap
da40427a0b
STORM-1795 Ad-hoc messages are received even when "Only friends and groups can call or IM me"
2012-01-16 14:27:35 -05:00
Richard Linden
cd4204b273
EXP-1758 WIP Progress spinner not shown during merketplace synch if Merchant Outbox floater was previously minimized
...
rewrote layout_stack resizing logic to be symmetrical
2012-01-16 11:03:33 -08:00
Jonathan Yap
1fc53d33bd
STORM-1799 Object doesn't appear in Block list if trying to block from Remote object inspector
2012-01-16 12:16:17 -05:00
Jonathan Yap
c0d2d316be
STORM-1796 Preferences->Privacy->Only friends and groups can call or IM me cannot be changed unless Voice Chat is enabled
2012-01-15 10:04:41 -05:00
Richard Linden
5e5105bd22
EXP-1770 WIP Drag and drop visual selection can be off across hierarchies
...
added throttling to fetchInventoryItem queries
2012-01-13 18:37:50 -08:00
Richard Linden
37cd2aafa7
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2012-01-13 16:42:06 -08:00
Richard Linden
6374099505
EXP-1770 WIP Drag and drop visual selection can be off across hierarchies
...
made shift-selection work consistently across folder boundaries
2012-01-13 16:41:54 -08:00
Leslie Linden
6b919e324e
EXP-1803 FIX -- Notify the user when a folder is automatically created for them in the outbox
...
* New confirmation dialog lets them know when a folder was automatically created to contain an item dragged/copied to the outbox.
2012-01-13 16:36:57 -08:00
Leslie Linden
d6add298d7
EXP-1802 FIX -- Create labeled drop target region at bottom of merchant outbox floater for easy top level drop access
...
* Added generic drop zone that highlights green when its functionality will be used.
2012-01-13 16:06:58 -08:00
merov
6051ac65d6
Pull from viewer-experience
2012-01-13 15:13:13 -08:00
merov
86ef722e7c
EXP-1775 : cleanup a bit PeekMessage() usage, avoid eating one event when reaching MAX_MESSAGE_PER_UPDATE.
2012-01-13 15:11:37 -08:00
Richard Linden
8600970476
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
2012-01-13 11:21:37 -08:00
Oz Linden
f6b8bfd3da
merge changes for vmrg-215
2012-01-13 09:58:47 -05:00
Oz Linden
6aa48f31c9
merge changes for vmrg-214
2012-01-13 09:58:22 -05:00
Xiaohong Bao
11bd5cb860
trivial: fix a mac build error.
2012-01-12 20:32:32 -07:00
Leslie Linden
ba41aea4b2
EXP-1795 FIX -- Update warning dialog for dragging and dropping no-copy items to Merchant Outbox
...
* Any drag and drop or copy operation to the merchant outbox that contains one
or more no-copy items now brings up a single modal dialog prompting the user
to move the no-copy items to the outbox or to leave them all behind.
2012-01-12 17:01:23 -08:00
Xiaohong Bao
f082de03ff
fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory crashes.
2012-01-12 16:36:56 -07:00
Leslie Linden
ec2b0e3af3
Fixing up 'cancel' button text on no-copy item transfer to outbox message
2012-01-12 14:17:47 -08:00
Richard Linden
f1c2707104
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-01-12 13:16:28 -08:00
Richard Linden
26829e6fa2
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
2012-01-12 12:54:46 -08:00
Jonathan Yap
2ae55b2be6
STORM-1798 'Block' menuitem title isn't changed after blocking item in object inspector
2012-01-12 15:42:31 -05:00
Leslie Linden
50a8fb4d2e
Merge with latest from viewer-experience
2012-01-12 10:58:12 -08:00
Merov Linden
37c68057c9
EXP-876 : Avoid ui elements using the same name reference.
2012-01-11 18:59:35 -08:00
Merov Linden
47a7d27800
Pull from viewer-experience
2012-01-11 17:43:51 -08:00
Merov Linden
33a17d8a83
EXP-1549 : Disable the Remove button menu item in the toolbar contextual menu if no button clicked
2012-01-11 17:43:17 -08:00
Leslie Linden
1307fad7c9
EXP-1752 FIX -- Merchant outbox import completion success modal dialog needs checkbox to disable
...
EXP-1795 PROGRESS -- Update warning dialog for dragging and dropping no-copy items to Merchant Outbox
* The text associated with EXP-1795 has been updated but the "apply to all"
checkbox has not been implemented yet.
* Updated the "0 folders" text to be an empty string instead.
2012-01-11 17:32:22 -08:00
callum
b41e66c1cb
EXP-1511 REFIX Preview image overlays ui elements in Upload image floater
...
Tweaked offset and missed a corner case
2012-01-11 17:15:06 -08:00
Leslie Linden
6452154b19
Correcting logic back to way it was, to make sure invalid objects can not be copied to the outbox
2012-01-11 16:53:08 -08:00