Power User implemented. Certain functions are only activated if you accept the consequences.

Some attempts to get the Texture Preview window working correctly.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-05 09:07:15 -04:00
parent 51665a0b31
commit 630d000246
17 changed files with 319 additions and 149 deletions

View File

@@ -751,10 +751,7 @@ BOOL LLTaskCategoryBridge::renameItem(const std::string& new_name)
BOOL LLTaskCategoryBridge::isItemRemovable()
{
// <edit>
//return FALSE;
return TRUE;
// </edit>
return FALSE;
}
void LLTaskCategoryBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
@@ -825,19 +822,19 @@ BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
case DAD_BODYPART:
case DAD_ANIMATION:
case DAD_GESTURE:
// <edit>
case DAD_CALLINGCARD:
// </edit>
// <edit>
case DAD_CALLINGCARD:
// </edit>
// *HACK: In order to resolve SL-22177, we need to block
// drags from notecards and objects onto other
// objects. uncomment the simpler version when we have
// that right.
accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data);
// <edit> testzone
//if(LLToolDragAndDrop::isInventoryDropAcceptable(
// object, (LLViewerInventoryItem*)cargo_data)
if(object->permModify()
// </edit>
accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data);
// <edit> testzone
//if(LLToolDragAndDrop::isInventoryDropAcceptable(
// object, (LLViewerInventoryItem*)cargo_data)
if(object->permModify()
// </edit>
&& (LLToolDragAndDrop::SOURCE_WORLD != LLToolDragAndDrop::getInstance()->getSource())
&& (LLToolDragAndDrop::SOURCE_NOTECARD != LLToolDragAndDrop::getInstance()->getSource()))
{
@@ -875,9 +872,9 @@ BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
LLToolDragAndDrop::getInstance()->getSourceID());
}
break;
// <edit>
//case DAD_CALLINGCARD:
// </edit>
// <edit>
//case DAD_CALLINGCARD:
// </edit>
default:
break;
}