Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added clickable names to radar events, and texture ctrls you can ctrl

Browse Source 
click to get the image into your pretend inventory.
This commit is contained in:
phr0z3nt04st
2010-06-15 16:04:05 -05:00
parent a1f1b19850
commit d8d0799837
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloateravatarlist.cpp
View File

@@ -102,6 +102,8 @@ void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool
} }
if (chat.mText != "") if (chat.mText != "")
{ {
chat.mFromName = name;
chat.mURL = llformat("secondlife:///app/agent/%s/about",key.asString().c_str());
chat.mSourceType = CHAT_SOURCE_SYSTEM; chat.mSourceType = CHAT_SOURCE_SYSTEM;
LLFloaterChat::addChat(chat); LLFloaterChat::addChat(chat);
} }

34
indra/newview/lltexturectrl.cpp
View File

@@ -402,7 +402,6 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
// <edit> // <edit>
//PermissionMask filter_perm_mask = mImmediateFilterPermMask; //PermissionMask filter_perm_mask = mImmediateFilterPermMask;
//if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask ) //if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
if(1)
// </edit> // </edit>
{ {
if (drop) if (drop)
@@ -413,10 +412,12 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
*accept = ACCEPT_YES_SINGLE; *accept = ACCEPT_YES_SINGLE;
} }
else // <edit>
/*else
{ {
*accept = ACCEPT_NO; *accept = ACCEPT_NO;
} }*/
// </edit>
} }
else else
{ {
@@ -1256,12 +1257,22 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL handled = LLUICtrl::handleMouseDown( x, y , mask ); BOOL handled = LLUICtrl::handleMouseDown( x, y , mask );
if( handled ) if( handled )
{ {
showPicker(FALSE); // <edit>
if( mask & MASK_CONTROL )
{
LLLocalInventory::addItem(mImageAssetID.asString(), (int)LLAssetType::AT_TEXTURE, mImageAssetID, true);
}
else
{
// </edit>
showPicker(FALSE);
//grab textures first... //grab textures first...
gInventory.startBackgroundFetch(gInventory.findCategoryUUIDForType(LLAssetType::AT_TEXTURE)); gInventory.startBackgroundFetch(gInventory.findCategoryUUIDForType(LLAssetType::AT_TEXTURE));
//...then start full inventory fetch. //...then start full inventory fetch.
gInventory.startBackgroundFetch(); gInventory.startBackgroundFetch();
//<edit>
}
} }
return handled; return handled;
} }
@@ -1453,7 +1464,6 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
// <edit> // <edit>
//PermissionMask filter_perm_mask = mImmediateFilterPermMask; //PermissionMask filter_perm_mask = mImmediateFilterPermMask;
//if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask ) //if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
if(1)
// </edit> // </edit>
{ {
if(mDragCallback) if(mDragCallback)
@@ -1465,10 +1475,12 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
return TRUE; return TRUE;
} }
} }
else // <edit>
/*else
{ {
return FALSE; return FALSE;
} }*/
// </edit>
} }
BOOL LLTextureCtrl::doDrop(LLInventoryItem* item) BOOL LLTextureCtrl::doDrop(LLInventoryItem* item)