aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/primbackup.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/primbackup.cpp')
-rw-r--r--linden/indra/newview/primbackup.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index ff65ed6..78fd482 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -72,8 +72,8 @@ class importResponder: public LLNewAgentInventoryResponder
72 public: 72 public:
73 73
74 importResponder(const LLSD& post_data, 74 importResponder(const LLSD& post_data,
75 const LLUUID& vfile_id, 75 const LLUUID& vfile_id,
76 LLAssetType::EType asset_type) 76 LLAssetType::EType asset_type)
77 : LLNewAgentInventoryResponder(post_data, vfile_id, asset_type) 77 : LLNewAgentInventoryResponder(post_data, vfile_id, asset_type)
78 { 78 {
79 } 79 }
@@ -229,9 +229,9 @@ primbackup::primbackup()
229 LLUICtrlFactory::getInstance()->buildFloater( this, "floater_prim_import.xml" ); 229 LLUICtrlFactory::getInstance()->buildFloater( this, "floater_prim_import.xml" );
230 230
231 // reposition floater from saved settings 231 // reposition floater from saved settings
232 LLRect rect = gSavedSettings.getRect( "FloaterPrimImport" ); 232 //LLRect rect = gSavedSettings.getRect( "FloaterPrimImport" );
233 reshape( rect.getWidth(), rect.getHeight(), FALSE ); 233 //reshape( rect.getWidth(), rect.getHeight(), FALSE );
234 setRect( rect ); 234 //setRect( rect );
235 235
236 running=false; 236 running=false;
237 textures.clear(); 237 textures.clear();
@@ -365,7 +365,7 @@ void primbackup::exportworker(void *userdata)
365 { 365 {
366 virtual bool apply(LLSelectNode* node) 366 virtual bool apply(LLSelectNode* node)
367 { 367 {
368 if(gAgent.getID()!=node->mPermissions->getCreator()) 368 if(gAgent.getID()!=node->mPermissions->getOwner())
369 { 369 {
370 #ifdef LL_GRID_PERMISSIONS 370 #ifdef LL_GRID_PERMISSIONS
371 return false; 371 return false;
@@ -373,7 +373,11 @@ void primbackup::exportworker(void *userdata)
373 return true; 373 return true;
374 #endif 374 #endif
375 } 375 }
376 return true; 376 else if(581632==node->mPermissions->getMaskOwner() || 2147483647==node->mPermissions->getMaskOwner())
377 {
378 return true;
379 }
380 return false;
377 } 381 }
378 } func; 382 } func;
379 383