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

whoops, accidentally broke editing items with the hex editor

Browse Source
This commit is contained in:
Hazim Gazov
2010-06-28 00:00:53 +00:00
parent dae72dcee4
commit b3a1750996
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/dofloaterhex.cpp
View File

@@ -31,17 +31,22 @@ DOFloaterHex::DOFloaterHex(LLUUID item_id, BOOL vfs, LLAssetType::EType asset_ty
: LLFloater() : LLFloater()
{ {
sInstances.push_back(this); sInstances.push_back(this);
mVFS = vfs;
//we are editing an asset directly from the VFS
if(vfs) if(vfs)
{ {
mVFS = true;
mAssetId = item_id; mAssetId = item_id;
mAssetType = asset_type; mAssetType = asset_type;
//we are editing an inventory item
} else { } else {
mVFS = false; mItem = (LLInventoryItem*)gInventory.getItem(item_id);
mAssetId = mItem->getAssetUUID(); mAssetId = mItem->getAssetUUID();
mAssetType = mItem->getType(); mAssetType = mItem->getType();
} }
llinfos << "Asset ID: " << item_id.asString() << llendl; //llinfos << "Asset ID: " << item_id.asString() << llendl;
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hex.xml"); LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hex.xml");
} }
@@ -57,11 +62,10 @@ void DOFloaterHex::show(LLUUID item_id, BOOL vfs, LLAssetType::EType asset_type)
gFloaterView->getNewFloaterPosition(&left, &top); gFloaterView->getNewFloaterPosition(&left, &top);
LLRect rect = gSavedSettings.getRect("FloaterHexRect"); LLRect rect = gSavedSettings.getRect("FloaterHexRect");
rect.translate(left - rect.mLeft, top - rect.mTop); rect.translate(left - rect.mLeft, top - rect.mTop);
DOFloaterHex* floaterp = new DOFloaterHex(item_id); DOFloaterHex* floaterp = new DOFloaterHex(item_id);
floaterp->setRect(rect); floaterp->setRect(rect);
floaterp->mItem = item;
gFloaterView->adjustToFitScreen(floaterp, FALSE); gFloaterView->adjustToFitScreen(floaterp, FALSE);
} }
} else if (item_id.notNull() && asset_type != LLAssetType::AT_NONE) { } else if (item_id.notNull() && asset_type != LLAssetType::AT_NONE) {