From a50755a505d1f984322e6e5a666b0fef7cfa1b2a Mon Sep 17 00:00:00 2001 From: Hazim Gazov Date: Wed, 21 Apr 2010 08:05:22 -0300 Subject: [PATCH] made permissions checks optional for opensim mode --- indra/newview/dofloaterhex.cpp | 5 ++++- indra/newview/hgfloatertexteditor.cpp | 5 ++++- indra/newview/llinventorybridge.cpp | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/indra/newview/dofloaterhex.cpp b/indra/newview/dofloaterhex.cpp index 2619e7dfb..b7a935338 100644 --- a/indra/newview/dofloaterhex.cpp +++ b/indra/newview/dofloaterhex.cpp @@ -101,16 +101,19 @@ BOOL DOFloaterHex::postBuild(void) } setTitle(title); } - +#if OPENSIM_RULES!=1 if(mItem->getCreatorUUID() == gAgentID) { +#endif /* OPENSIM_RULES!=1 */ // Load the asset editor->setVisible(FALSE); childSetText("status_text", std::string("Loading...")); DOInventoryBackup::download(mItem, this, imageCallback, assetCallback); +#if OPENSIM_RULES!=1 } else { this->close(false); } +#endif /* OPENSIM_RULES!=1 */ return TRUE; } diff --git a/indra/newview/hgfloatertexteditor.cpp b/indra/newview/hgfloatertexteditor.cpp index d1066151a..71ec69f9b 100644 --- a/indra/newview/hgfloatertexteditor.cpp +++ b/indra/newview/hgfloatertexteditor.cpp @@ -82,16 +82,19 @@ BOOL HGFloaterTextEditor::postBuild(void) } setTitle(title); } - +#if OPENSIM_RULES!=1 if(mItem->getCreatorUUID() == gAgentID) { +#endif /* OPENSIM_RULES!=1 */ // Load the asset editor->setVisible(FALSE); childSetText("status_text", std::string("Loading...")); DOInventoryBackup::download(mItem, this, imageCallback, assetCallback); +#if OPENSIM_RULES!=1 } else { this->close(false); } +#endif /* OPENSIM_RULES!=1 */ return TRUE; } diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 058e23167..92798779a 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -772,14 +772,18 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model, { LLInventoryItem* item = model->getItem(mUUID); if(!item) return; +#if OPENSIM_RULES!=1 if(item->getCreatorUUID() != gAgentID) return; +#endif /* OPENSIM_RULES!=1 */ DOFloaterHex::show(mUUID); } else if("open text" == action) { LLInventoryItem* item = model->getItem(mUUID); if(!item) return; +#if OPENSIM_RULES!=1 if(item->getCreatorUUID() != gAgentID) return; +#endif /* OPENSIM_RULES!=1 */ HGFloaterTextEditor::show(mUUID); } else if ("copy_uuid" == action)