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

made permissions checks optional for opensim mode

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-21 08:05:22 -03:00
parent d94405b91c
commit a50755a505
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/dofloaterhex.cpp
View File

@@ -101,16 +101,19 @@ BOOL DOFloaterHex::postBuild(void)
} }
setTitle(title); setTitle(title);
} }
#if OPENSIM_RULES!=1
if(mItem->getCreatorUUID() == gAgentID) if(mItem->getCreatorUUID() == gAgentID)
{ {
#endif /* OPENSIM_RULES!=1 */
// Load the asset // Load the asset
editor->setVisible(FALSE); editor->setVisible(FALSE);
childSetText("status_text", std::string("Loading...")); childSetText("status_text", std::string("Loading..."));
DOInventoryBackup::download(mItem, this, imageCallback, assetCallback); DOInventoryBackup::download(mItem, this, imageCallback, assetCallback);
#if OPENSIM_RULES!=1
} else { } else {
this->close(false); this->close(false);
} }
#endif /* OPENSIM_RULES!=1 */
return TRUE; return TRUE;
} }

5
indra/newview/hgfloatertexteditor.cpp
View File

@@ -82,16 +82,19 @@ BOOL HGFloaterTextEditor::postBuild(void)
} }
setTitle(title); setTitle(title);
} }
#if OPENSIM_RULES!=1
if(mItem->getCreatorUUID() == gAgentID) if(mItem->getCreatorUUID() == gAgentID)
{ {
#endif /* OPENSIM_RULES!=1 */
// Load the asset // Load the asset
editor->setVisible(FALSE); editor->setVisible(FALSE);
childSetText("status_text", std::string("Loading...")); childSetText("status_text", std::string("Loading..."));
DOInventoryBackup::download(mItem, this, imageCallback, assetCallback); DOInventoryBackup::download(mItem, this, imageCallback, assetCallback);
#if OPENSIM_RULES!=1
} else { } else {
this->close(false); this->close(false);
} }
#endif /* OPENSIM_RULES!=1 */
return TRUE; return TRUE;
} }

4
indra/newview/llinventorybridge.cpp
View File

@@ -772,14 +772,18 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model,
{ {
LLInventoryItem* item = model->getItem(mUUID); LLInventoryItem* item = model->getItem(mUUID);
if(!item) return; if(!item) return;
#if OPENSIM_RULES!=1
if(item->getCreatorUUID() != gAgentID) return; if(item->getCreatorUUID() != gAgentID) return;
#endif /* OPENSIM_RULES!=1 */
DOFloaterHex::show(mUUID); DOFloaterHex::show(mUUID);
} }
else if("open text" == action) else if("open text" == action)
{ {
LLInventoryItem* item = model->getItem(mUUID); LLInventoryItem* item = model->getItem(mUUID);
if(!item) return; if(!item) return;
#if OPENSIM_RULES!=1
if(item->getCreatorUUID() != gAgentID) return; if(item->getCreatorUUID() != gAgentID) return;
#endif /* OPENSIM_RULES!=1 */
HGFloaterTextEditor::show(mUUID); HGFloaterTextEditor::show(mUUID);
} }
else if ("copy_uuid" == action) else if ("copy_uuid" == action)