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

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

2
indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
View File

@@ -55,7 +55,7 @@
halign="center" height="20" label="Select" label_selected="Select" halign="center" height="20" label="Select" label_selected="Select"
left="290" mouse_opaque="true" name="Select" scale_image="true" width="100" /> left="290" mouse_opaque="true" name="Select" scale_image="true" width="100" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="10" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="10"
left="8" follows="bottom" font="SansSerif" handle_edit_keys_directly="true" left="8" follows="bottom" font="SansSerif" handle_edit_keys_directly="false"
height="20" max_length="36" mouse_opaque="true" name="texture_uuid" height="20" max_length="36" mouse_opaque="true" name="texture_uuid"
select_all_on_focus_received="false" width="230" /> select_all_on_focus_received="false" width="230" />
<button enabled="true" follows="top|right" font="SansSerif" <button enabled="true" follows="top|right" font="SansSerif"