59950f6178
EXP-1778 FIX -- Link to Marketplace Error log in transfer failed viewer notification
...
* Added a link to the "imports" log from the "done with errors" notification when
sending folders to the marketplace.
2012-01-11 16:49:32 -08:00
542c31d547
EXP-1788 FIX -- Outbox drag and drop restrictions can be bypassed if inventory not fully loaded
...
* The "Copy to Outbox" option is now disabled when the item is in the loading state.
2012-01-11 13:37:43 -08:00
98f071aa6f
EXP-1790 FIX -- Hitting return on item in Merchant Outbox wears the object
...
* Disabled the "openItem" function on outbox items to prevent default behavior
when the return button is pressed.
2012-01-11 11:59:34 -08:00
0a1cb4f03e
EXP-1791 FIX -- Handle case where initialization with SLM fails in the Merchant Outbox floater in the viewer
...
* Updated marketplace import to properly handle failed cases of authentications
and invalid cookies. The import will reset to an uninitialized state and then
trigger and initialization followed immediately by an import when appropriate.
2012-01-11 11:26:56 -08:00
daa96009a2
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2012-01-11 10:21:32 -08:00
3169f4a96f
assert for updating views while drawing was too aggressive
...
made assert match actual error condition for list iterators
reviewed by Leslie
2012-01-11 10:19:11 -08:00
00b767e5a9
EXP-1791 - Handle case where initialization with SLM fails in the Merchant Outbox floater in the viewer
...
* Added code to clear and re-initialize the SLM cookie when authentication errors are encountered.
* Re-organized logic for outbox import a bit to hopefully be more robust when errors are encountered.
2012-01-11 10:05:15 -08:00
4be85a0e3d
FIX INTL-89 translation in 8 languages for Set29 including new files
2012-01-10 17:08:20 -08:00
b2b421acb6
Changed merchant outbox visibility to not persist between sessions.
2012-01-10 16:15:57 -08:00
16112a32e8
EXP-1783 FIXED Duplicated/missing IDs in menu_viewer.xml
2012-01-10 20:56:52 +02:00
9cdfecd9e1
EXP-1765 (Add debug info) crash on startup at LLWindowWin32::switchContext()
2012-01-10 10:40:27 -08:00
7bc4085eb2
STORM-1788 Clarify wording in About Land->Access and tooltips (and similar Estate panel)
2012-01-10 12:03:20 -05:00
0434771b04
EXP-1766 FIXED Disabled updating agent AFK state if the viewer is disconnected. Possible crash fix.
2012-01-10 17:20:49 +02:00
a47e9bd97b
EXP-1525 FIXED Potential fix for a crash at shutdown: added some error handling to saving inventory cache.
2012-01-10 16:35:36 +02:00
c4a08e6c9d
EXP-1511 FIX Preview image overlays ui elements in Upload image floater
2012-01-09 14:42:34 -08:00
98a85b1bf2
EXP-1159 FIX -- User can get No transfer items into Merchant Outbox by rezzing object from Outbox, including No Transfer item in contents, and then taking back into Inventory
...
* Drag and drop to the 3D world is now disabled from the outbox
2012-01-09 13:39:58 -08:00
651fdba651
sync with viewer-development
2012-01-09 11:42:04 -08:00
1422be8312
Merge from viewer-development
2012-01-09 09:56:52 -08:00
4c5141c567
Added tag 3.2.6-start for changeset 2174ed1c7129
2012-01-09 12:29:39 -05:00
fc00c99532
remove incorrect tag
2012-01-09 12:29:13 -05:00
1fb6dbbf80
Backed out changeset 4fd359f2f1c3
2012-01-09 12:26:57 -05:00
3ed8f89076
merge
2012-01-09 09:47:19 -05:00
3dfb1536fa
increment viewer version to 3.2.7
2012-01-09 08:41:36 -05:00
41ceee848b
increment viewer version to 3.2.7
2012-01-09 08:41:36 -05:00
8c0023eec4
Added tag 3.6.0-start for changeset a1012611a195
2012-01-09 08:40:42 -05:00
3763386987
merge changes for vmrg-213
2012-01-08 10:48:26 -05:00
c98bf3cd50
Updated InventoryOutboxMaxFolderCount to 21 to allow top level folder and 20 subfolders in outbox items
2012-01-06 15:50:43 -08:00
f64ad025e8
sync with viewer-development
2012-01-06 15:29:55 -08:00
60df5e51dc
EXP-1220 GROUNDWORK -- Create context menu entry to allow import of selected item(s)
...
* Added a context menu for "Send to Marketplace" but disabled the code to show it
until we decide to move forward with this feature.
* Made some progress unifying the context menu in the outbox for different types
of items. (mesh, audio, etc.)
2012-01-06 13:01:17 -08:00
757a955bd7
Looking for better fix to EXP-1693 - date localization
...
Backed out changeset: 4f3024e9d629
2012-01-06 12:07:52 -08:00
377e35af14
looking for better fix to EXP-1695
...
[I18N] [INCORRECT CURRENCY LAYOUT/FORMAT] - Currency in
Group Profile > Land/Asset and New Group (French viewer)
Backed out changeset: c01a6186b15c
2012-01-06 09:19:10 -08:00
66555b844d
merge changes for vmrg-212
2012-01-06 08:08:55 -05:00
7b4f3f668b
merge changes for vmrg-211
2012-01-06 07:58:35 -05:00
cd103463c0
pull back tags from beta and release branches
2012-01-06 07:58:14 -05:00
bd3a652eab
Add capability-based create folder routine for more reliable inventory, with fix for copy and wear
2012-01-06 07:46:53 -05:00
837e38d819
trivial: debug code for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-05 21:26:35 -07:00
1410893276
fix for SH-2829: [crashhunters] Crash in LLWearable::importFile()/LLOverrideBakedTextureUpdate::LLOverrideBakedTextureUpdate()
2012-01-05 21:26:06 -07:00
af32a74b77
EXP-1757 FIX -- Merchant Outbox shows as empty when first opening/initializing even when populated
...
* Updated merchant outbox floater to not wait for initialization to complete before displaying outbox inventory contents.
2012-01-05 16:30:15 -08:00
b0db21a8ae
EXP-1754 FIX -- Search text shown in Outbox floater after marketplace synch if all items removed.
...
* Added a setting to determine whether or not to display the standard empty inventory message.
The message is on by default but turned off for the merchant outbox inventory panel.
2012-01-05 15:40:27 -08:00
2d2b80620b
Merge with viewer-experience
2012-01-05 12:44:02 -08:00
26998a5e38
EXP-1753 FIX -- Open Merchant Outbox floater when user selects copy to Merchant Outbox context menu option in Inventory
...
* Modified "copy to merchant outbox" and "move to merchant outbox" context menu actions to also open the merchant outbox floater
* Changed context menu behavior to always preserve disabled menu items on multiselect rather than occasionally ignoring it
2012-01-05 12:42:58 -08:00
bf8e113701
merge
2012-01-05 14:37:06 -05:00
66fcc2da39
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-01-05 10:59:29 -08:00
263fd13458
Removed unused code for old outbox error reporting
2012-01-05 10:57:09 -08:00
12819b6637
Latest from viewer-experience
2012-01-05 09:44:19 -08:00
ce1f95bade
trivial: debug code for SH-2828: [crashhunters] Crash in LLRefCount::unref(), bad stacks
2012-01-04 21:06:54 -07:00
9c8f6ba6a5
Modified CRASH assert to not occur in release mode per Richard
2012-01-04 17:37:57 -08:00
46ac2341de
Merge from viewer-experience
2012-01-04 17:36:36 -08:00
990b5aea2b
EXP-1769 FIX -- Crash in ASSERT (mInDraw == false) - can trigger with selecting build tool
...
* Fixed build window to not fail assert at construction time.
2012-01-04 17:34:11 -08:00
6fed3bed60
Merge from viewer-development
2012-01-04 15:42:30 -08:00
Leslie Linden