From 98a85b1bf2d7decf477d3d1076859fdeec6f1b46 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 9 Jan 2012 13:39:58 -0800 Subject: 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 --- indra/newview/lltooldraganddrop.cpp | 17 ++++++++++++++++- indra/newview/skins/default/xui/en/strings.xml | 21 +++++++++++---------- 2 files changed, 27 insertions(+), 11 deletions(-) (limited to 'indra') diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 6338ea477c..5a4d177709 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -769,6 +769,21 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop, if (!handled) { + // Disallow drag and drop to 3D from the outbox + const LLUUID outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false, false); + if (outbox_id.notNull()) + { + for (S32 item_index = 0; item_index < (S32)mCargoIDs.size(); item_index++) + { + if (gInventory.isObjectDescendentOf(mCargoIDs[item_index], outbox_id)) + { + *acceptance = ACCEPT_NO; + mToolTipMsg = LLTrans::getString("TooltipOutboxDragToWorld"); + return; + } + } + } + dragOrDrop3D( x, y, mask, drop, acceptance ); } } @@ -867,7 +882,7 @@ void LLToolDragAndDrop::pick(const LLPickInfo& pick_info) (U32)mLastAccept, (U32)callMemberFunction(*this, LLDragAndDropDictionary::instance().get(dad_type, target)) - (hit_obj, hit_face, pick_info.mKeyMask, FALSE)); + (hit_obj, hit_face, pick_info.mKeyMask, FALSE)); } if (mDrop && ((U32)mLastAccept >= ACCEPT_YES_COPY_SINGLE)) diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 20d9463186..a78f3df5b6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -18,7 +18,7 @@ Clearing cache... Initializing texture cache... Initializing VFS... - Graphics initialization failed. Please update your graphics driver! + Graphics initialization failed. Please update your graphics driver! Restoring... @@ -35,9 +35,9 @@ Previous login attempt failed. Logging in, attempt [NUMBER] Loading world... Initializing embedded web browser... - Initializing multimedia... - Loading fonts... - Verifying cache files (can take 60-90 seconds)... + Initializing multimedia... + Loading fonts... + Verifying cache files (can take 60-90 seconds)... Processing response... Initializing world... Decoding images... @@ -49,12 +49,12 @@ Waiting for region handshake... Connecting to region... Downloading clothing... - The server returned an invalid or corrupt certificate. Please contact the Grid administrator. - An invalid hostname was used to access the server, please check your SLURL or Grid hostname. - The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator. - The certificate returned by the server could not be used for SSL. Please contact your Grid administrator. - Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. - The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. + The server returned an invalid or corrupt certificate. Please contact the Grid administrator. + An invalid hostname was used to access the server, please check your SLURL or Grid hostname. + The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator. + The certificate returned by the server could not be used for SSL. Please contact your Grid administrator. + Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. + The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. Network error: Could not establish connection, please check your network connection. Login failed. @@ -165,6 +165,7 @@ Please try logging in again in a minute. Only a single item can be dragged here + You can not rez items in your merchant outbox One or more of these objects cannot be sold or transferred. Your merchant outbox can only accept items directly from your inventory You can not put items you are wearing into your merchant outbox -- cgit v1.2.3