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

These are things, I'm sleepy

Browse Source
This commit is contained in:
Liru Færs
2019-10-19 07:09:52 -04:00
parent 4043130f75
commit 0f28a1bd86
6 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lltexturectrl.cpp
View File

@@ -75,7 +75,6 @@
// </edit>
// tag: vaa emerald local_asset_browser [begin]
//#include <boost/algorithm/cxx11/any_of.hpp>
#include "floaterlocalassetbrowse.h"
#include "llscrolllistctrl.h"
#define LOCALLIST_COL_ID 1
@@ -298,10 +297,9 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id)
}
/* TODO: Figure out how to select local asset if in use?
// tag: vaa emerald local_asset_browser [begin]
else if (boost::algorithm::any_of_equal(mLocalScrollCtrl->getAllIDs(), mImageAssetID))
else if (mLocalScrollCtrl->selectByID(mImageAssetID))
{
tab = "local_tab";
mLocalScrollCtrl->selectByID(mImageAssetID);
}
// tag: vaa emerald local_asset_browser [end]
*/
@@ -966,7 +964,7 @@ void LLFloaterTexturePicker::onBtnBrowser(void *userdata)
// reacts to user clicking a valid field in the local scroll list.
void LLFloaterTexturePicker::onLocalScrollCommit()
{
LLUUID id(mLocalScrollCtrl->getSelectedItemLabel(LOCALLIST_COL_ID));
LLUUID id(mLocalScrollCtrl->getStringUUIDSelectedItem());
mOwner->setImageAssetID(id);
if (childGetValue("apply_immediate_check").asBoolean())