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

"None" button replaced with an "Alpha" button - I'm not sure any grid allows "no" texture on an object, and I don't even know what an object looks like with no texture.

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-09 01:09:06 -04:00
parent 371a4a697c
commit e3b22571f2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/lltexturectrl.cpp
View File

@@ -160,7 +160,7 @@ public:
//static void onBtnRevert( void* userdata ); //static void onBtnRevert( void* userdata );
static void onBtnWhite( void* userdata ); static void onBtnWhite( void* userdata );
static void onBtnInvisible( void* userdata ); static void onBtnInvisible( void* userdata );
static void onBtnNone( void* userdata ); static void onBtnAlpha( void* userdata );
static void onBtnClear( void* userdata ); static void onBtnClear( void* userdata );
static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data); static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
static void onShowFolders(LLUICtrl* ctrl, void* userdata); static void onShowFolders(LLUICtrl* ctrl, void* userdata);
@@ -178,6 +178,7 @@ protected:
LLUUID mWhiteImageAssetID; LLUUID mWhiteImageAssetID;
LLUUID mInvisibleImageAssetID; LLUUID mInvisibleImageAssetID;
LLUUID mSpecialCurrentImageAssetID; // Used when the asset id has no corresponding texture in the user's inventory. LLUUID mSpecialCurrentImageAssetID; // Used when the asset id has no corresponding texture in the user's inventory.
LLUUID mAlphaImageAssetID;
LLUUID mOriginalImageAssetID; LLUUID mOriginalImageAssetID;
std::string mLabel; std::string mLabel;
@@ -218,6 +219,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
mFallbackImageName( fallback_image_name ), mFallbackImageName( fallback_image_name ),
mWhiteImageAssetID( gSavedSettings.getString( "UIImgWhiteUUID" ) ), mWhiteImageAssetID( gSavedSettings.getString( "UIImgWhiteUUID" ) ),
mInvisibleImageAssetID(gSavedSettings.getString("UIImgInvisibleUUID")), mInvisibleImageAssetID(gSavedSettings.getString("UIImgInvisibleUUID")),
mAlphaImageAssetID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"),
mOriginalImageAssetID(owner->getImageAssetID()), mOriginalImageAssetID(owner->getImageAssetID()),
mLabel(label), mLabel(label),
mTentativeLabel(NULL), mTentativeLabel(NULL),
@@ -237,7 +239,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
childSetAction("Default",LLFloaterTexturePicker::onBtnSetToDefault,this); childSetAction("Default",LLFloaterTexturePicker::onBtnSetToDefault,this);
childSetAction("None", LLFloaterTexturePicker::onBtnNone,this); childSetAction("Alpha", LLFloaterTexturePicker::onBtnAlpha,this);
childSetAction("Blank", LLFloaterTexturePicker::onBtnWhite,this); childSetAction("Blank", LLFloaterTexturePicker::onBtnWhite,this);
childSetAction("Invisible", LLFloaterTexturePicker::onBtnInvisible,this); childSetAction("Invisible", LLFloaterTexturePicker::onBtnInvisible,this);
@@ -590,7 +592,7 @@ void LLFloaterTexturePicker::draw()
childSetEnabled("Default", mImageAssetID != mOwner->getDefaultImageAssetID()); childSetEnabled("Default", mImageAssetID != mOwner->getDefaultImageAssetID());
childSetEnabled("Blank", mImageAssetID != mWhiteImageAssetID ); childSetEnabled("Blank", mImageAssetID != mWhiteImageAssetID );
childSetEnabled("Invisible", mOwner->getAllowInvisibleTexture() && mImageAssetID != mInvisibleImageAssetID ); childSetEnabled("Invisible", mOwner->getAllowInvisibleTexture() && mImageAssetID != mInvisibleImageAssetID );
childSetEnabled("None", mOwner->getAllowNoTexture() && !mImageAssetID.isNull() ); childSetEnabled("Alpha", mImageAssetID != mAlphaImageAssetID );
LLFloater::draw(); LLFloater::draw();
@@ -734,10 +736,10 @@ void LLFloaterTexturePicker::onBtnInvisible(void* userdata)
// static // static
void LLFloaterTexturePicker::onBtnNone(void* userdata) void LLFloaterTexturePicker::onBtnAlpha(void* userdata)
{ {
LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata; LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
self->setImageID( LLUUID::null ); self->setImageID(self->mAlphaImageAssetID);
self->commitIfImmediateSet(); self->commitIfImmediateSet();
} }