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

that should mostly be it for local inventory

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-23 10:52:43 -03:00
parent f4857c6afb
commit 4f15cb4490
5 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/hgfloatertexteditor.cpp
View File

@@ -23,6 +23,7 @@
#include "llinventorymodel.h" // gInventory.updateItem
#include "llappviewer.h" // gLocalInventoryRoot
#include "llfloaterperms.h" //get default perms
#include "lllocalinventory.h"
std::list<HGFloaterTextEditor*> HGFloaterTextEditor::sInstances;
S32 HGFloaterTextEditor::sUploadAmount = 10;
@@ -224,10 +225,10 @@ void HGFloaterTextEditor::assetCallback(LLVFS *vfs,
}
// Never enable save if it's a pretend item
/* if(gInventory.isObjectDescendentOf(item->getUUID(), gLocalInventoryRoot))
if(gInventory.isObjectDescendentOf(item->getUUID(), gLocalInventoryRoot))
{
floater->childSetEnabled("save_btn", false);
} */
}
}
// static
@@ -264,7 +265,6 @@ void HGFloaterTextEditor::onClickUpload(void* user_data)
if(item->getType() != LLAssetType::AT_GESTURE && item->getType() != LLAssetType::AT_LSL_TEXT
&& item->getType() != LLAssetType::AT_NOTECARD)
{
//U32 const std::string &display_name, LLAssetStorage::LLStoreAssetCallback callback, S32 expected_upload_cost, void *userdata)
upload_new_resource(transaction_id,
item->getType(),
item->getName(),