livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-8842 Should not be able to add Environment Setting Assets to Group Notices on a Non-EEP region

master
andreykproductengine 2018-07-19 22:27:49 +03:00
parent affb75666c
commit 80f98daed9
2 changed files with 61 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
indra/newview/llviewertexteditor.cpp
View File

@ -31,6 +31,7 @@
#include "llagent.h"
#include "llaudioengine.h"
#include "llavataractions.h"
#include "llenvironment.h"
#include "llfloaterreg.h"
#include "llfloatersidepanelcontainer.h"
#include "llfloaterworldmap.h"
@ -854,8 +855,18 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
if (getEnabled() && acceptsTextInput())
{
bool supported = false;
switch( cargo_type )
{
case DAD_SETTINGS:
{
supported = LLEnvironment::instance().isExtendedEnvironmentEnabled();
if (!supported && tooltip_msg.empty())
{
tooltip_msg.assign(LLTrans::getString("TooltipNotecardNotAllowedTypeDrop"));
}
break;
}
case DAD_CALLINGCARD:
case DAD_TEXTURE:
case DAD_SOUND:
@ -868,55 +879,52 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
case DAD_ANIMATION:
case DAD_GESTURE:
case DAD_MESH:
case DAD_SETTINGS:
{
LLInventoryItem *item = (LLInventoryItem *)cargo_data;
if( item && allowsEmbeddedItems() )
{
U32 mask_next = item->getPermissions().getMaskNextOwner();
if((mask_next & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
{
if( drop )
{
deselect();
S32 old_cursor = mCursorPos;
setCursorAtLocalPos( x, y, TRUE );
S32 insert_pos = mCursorPos;
setCursorPos(old_cursor);
BOOL inserted = insertEmbeddedItem( insert_pos, item );
if( inserted && (old_cursor > mCursorPos) )
{
setCursorPos(mCursorPos + 1);
}
needsReflow();
}
*accept = ACCEPT_YES_COPY_MULTI;
}
else
{
*accept = ACCEPT_NO;
if (tooltip_msg.empty())
{
// *TODO: Translate
tooltip_msg.assign("Only items with unrestricted\n"
"'next owner' permissions \n"
"can be attached to notecards.");
}
}
}
else
{
*accept = ACCEPT_NO;
}
supported = true;
break;
}
default:
*accept = ACCEPT_NO;
supported = false;
break;
}
LLInventoryItem *item = (LLInventoryItem *)cargo_data;
if (item && allowsEmbeddedItems() && supported)
{
U32 mask_next = item->getPermissions().getMaskNextOwner();
if((mask_next & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
{
if( drop )
{
deselect();
S32 old_cursor = mCursorPos;
setCursorAtLocalPos( x, y, TRUE );
S32 insert_pos = mCursorPos;
setCursorPos(old_cursor);
BOOL inserted = insertEmbeddedItem( insert_pos, item );
if( inserted && (old_cursor > mCursorPos) )
{
setCursorPos(mCursorPos + 1);
}
needsReflow();
}
*accept = ACCEPT_YES_COPY_MULTI;
}
else
{
*accept = ACCEPT_NO;
if (tooltip_msg.empty())
{
tooltip_msg.assign(LLTrans::getString("TooltipNotecardOwnerRestrictedDrop"));
}
}
}
else
{
*accept = ACCEPT_NO;
}
}
else
{

11
indra/newview/skins/default/xui/en/strings.xml
View File

@ -315,6 +315,17 @@ Please try logging in again in a minute.</string>
<string name="BUTTON_DOCK">Dock</string>
<string name="BUTTON_HELP">Show Help</string>
<!-- ToolTips for notecards -->
<string name="TooltipNotecardNotAllowedTypeDrop">
Items of this type can't be attached
to notecards on this region.
</string>
<string name="TooltipNotecardOwnerRestrictedDrop">
Only items with unrestricted
'next owner' permissions
"can be attached to notecards.
</string>
<!-- searching - generic -->
<string name="Searching">Searching...</string>
<string name="NoneFound">None found.</string>