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

Removed some TOS/TPVp violations that we missed in the last sweep

Browse Source 
Fix for the client definitions - Emerald's color is corrected, Emergence now reports properly.
Fixed the error "Client crashes if preferences is opened on login screen"

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-04 16:18:24 -04:00
parent dcf46b5c47
commit a104e23fdb
10 changed files with 1026 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
indra/newview/lltexturectrl.cpp
View File

@@ -309,7 +309,6 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id)
mNoCopyTextureSelected = FALSE;
mIsDirty = TRUE;
mImageAssetID = image_id;
/* I'm good, thanks
LLUUID item_id = findItemID(mImageAssetID, FALSE);
if (item_id.isNull())
{
@@ -327,7 +326,6 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id)
}
mInventoryPanel->setSelection(item_id, TAKE_FOCUS_NO);
}
*/
}
}
@@ -1281,43 +1279,6 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
return handled;
}
// <edit>
//static
void LLTextureCtrl::handleClickOpenTexture(void* userdata)
{
LLTextureCtrl* clickedTexture = static_cast<LLTextureCtrl*>(userdata);
if(clickedTexture)
LLLocalInventory::addItem(clickedTexture->mImageAssetID.asString(), (int)LLAssetType::AT_TEXTURE, clickedTexture->mImageAssetID, true);
}
//static
void LLTextureCtrl::handleClickCopyAssetID(void* userdata)
{
LLTextureCtrl* clickedTexture = static_cast<LLTextureCtrl*>(userdata);
if(clickedTexture)
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(clickedTexture->mImageAssetID.asString()));
}
BOOL LLTextureCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLUICtrl::handleRightMouseDown( x, y , mask );
if( handled )
{
LLMenuGL* menu = new LLMenuGL(LLStringUtil::null);
menu->append(new LLMenuItemCallGL("Open", LLTextureCtrl::handleClickOpenTexture, NULL, this));
menu->append(new LLMenuItemCallGL("Copy Asset UUID", LLTextureCtrl::handleClickCopyAssetID, NULL, this));
menu->updateParent(LLMenuGL::sMenuContainer);
menu->setCanTearOff(FALSE);
LLMenuGL::showPopup(this, menu, x, y);
}
return handled;
}
// </edit>
void LLTextureCtrl::onFloaterClose()
{
LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
@@ -1504,10 +1465,9 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
// PermissionMask filter_perm_mask = mCanApplyImmediately ? commented out due to no-copy texture loss.
// mImmediateFilterPermMask : mNonImmediateFilterPermMask;
// <edit>
//PermissionMask filter_perm_mask = mImmediateFilterPermMask;
//if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
// </edit>
PermissionMask filter_perm_mask = mImmediateFilterPermMask;
if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
{
if(mDragCallback)
{
@@ -1518,12 +1478,10 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
return TRUE;
}
}
// <edit>
/*else
{
return FALSE;
}*/
// </edit>
}
}
BOOL LLTextureCtrl::doDrop(LLInventoryItem* item)