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
7026c80d51
reconciled .hgtags
2012-01-04 17:49:24 -05:00
b99dfa7d46
Added tag DRTVWR-107_3.2.5-beta2, 3.2.5-beta2 for changeset 65a2c1c8d855
2012-01-04 17:42:40 -05:00
e326b1e0fa
Added tag DRTVWR-106_3.2.5-beta1, 3.2.5-beta1 for changeset 3d2d5d244c63
2012-01-04 17:41:54 -05:00
1c4474f894
Merge from viewer-experience
2012-01-04 14:06:36 -08:00
912833bafa
EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would create a hierarchy that contains too many folders
...
* Updated drag and drop to correctly handle moving to and from outbox as opposed to within the outbox when dealing with
folder and item count limitations related to depth and total folder count.
2012-01-04 14:04:32 -08:00
4405910caa
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-04 14:15:05 -07:00
94ad019ce3
fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers
...
reviewed by vir
2012-01-04 14:14:23 -07:00
f92fd78e74
merge changes for storm-1790
2012-01-04 10:46:12 -05:00
23362692e1
merge changes for storm-1708
2012-01-04 10:37:17 -05:00
ce6bd89ca4
Changes per Oz's suggestion on RB.
2012-01-04 15:16:35 +00:00
988cb62d43
merge changes for storm-1727
2012-01-04 10:11:59 -05:00
a3e30250e8
merge
2012-01-04 09:59:57 -05:00
d0c7eaa7cf
merge changes for storm-1725
2012-01-04 09:33:50 -05:00
97630acce0
merge changes for storm-1708
2012-01-04 09:32:38 -05:00
1ce22e0a5d
merge changes for latest viewer-development
2012-01-04 09:06:07 -05:00
377a9ab9ac
EXP-1586 ADDITIONAL FIX (Nearby chat window no longer persists between viewer startups)
...
- Got rid of confusing conditions.
2012-01-04 14:50:15 +02:00
1b1ad93c5d
EXP-1512 FIX changing UI size changes cursor position in notecards
...
fixed case where adding text between 2 consecutive newlines created gibberish
2012-01-03 12:21:30 -08:00
9f92904343
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2012-01-03 09:41:49 -08:00
3861249a74
use lazy deletion of views via die() method to avoid some potential crashes
2012-01-03 09:41:16 -08:00
ed431700ed
EXP-1756 FIXED setting user defined window size via floater Window Size.
2011-12-30 22:31:19 +02:00
cbeaf3d7a0
EXP-1586 FIXED (Nearby chat window no longer persists between viewer startups)
...
- Visibility state of chat floater is saved between sessions
- Also visibility state of chat history in nearby chat floater is saved too
2011-12-30 18:32:04 +02:00
0380372a54
EXP-1523 WIP Defensive fix for a crash at LLFolderView::onItemsRemovalConfirmation().
2011-12-30 16:30:26 +02:00
681ecc0d0f
EXP-1593 FIXED Navbar was displayed after exitting hide contorls mode, even if disabled via settings.
...
Apparently, the way we showed/hid the panels was wrong.
2011-12-28 18:35:00 +02:00
6c1219a5e4
EXP-1624 FIXED ([TRANSLATED BUT IN EN] tooltip for chat floater in English: Shows/hides nearby chat log)
...
Reason:
- Panel name was missed in other locales.
Solution:
- Added panel name to other locales.
2011-12-26 20:53:41 +02:00
969e9b3315
EXP-1621 FIXED (Duplicated XUI ID: panel_snapshot_postcard.xml)
...
- Removed duplicated parameters
2011-12-26 16:01:13 +02:00
1a537bb194
EXP-1618 (Serious truncation in top-right status bar "Buy $S" and "Shop" buttons in many languages)
...
- Adjusted width of "shop" button in all locales. Had to override width parameter in xml files of all locales. If to set one value with extra room space for all locales it will look rather ugly for many locales including EN.
2011-12-26 15:57:42 +02:00
Leslie Linden