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

and now a sort of working version.

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-16 04:22:23 -03:00
parent 31568240fd
commit fd92e34f28
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lltexturectrl.cpp
View File

@@ -482,6 +482,8 @@ void LLFloaterTexturePicker::onClose(bool app_quitting)
BOOL LLFloaterTexturePicker::postBuild()
{
LLFloater::postBuild();
childSetValue("texture_uuid", mImageAssetID);
if (!mLabel.empty())
{
@@ -557,7 +559,6 @@ void LLFloaterTexturePicker::draw()
childSetEnabled("Select", mActive);
childSetEnabled("Pipette", mActive);
childSetValue("Pipette", LLToolMgr::getInstance()->getCurrentTool() == LLToolPipette::getInstance());
childSetValue("texture_uuid", mImageAssetID);
//RN: reset search bar to reflect actual search query (all caps, for example)
mSearchEdit->setText(mInventoryPanel->getFilterSubString());
@@ -922,6 +923,7 @@ void LLFloaterTexturePicker::onTextureSelect( const LLTextureEntry& te, void *da
self->mNoCopyTextureSelected = FALSE;
//<edit>
self->childSetValue("texture_uuid", te.getID().asString());
/*
LLInventoryItem* itemp = gInventory.getItem(inventory_item_id);