From 6a1dd7249946e3c9aee581de0d547f337b24870b Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 3 Sep 2009 03:09:14 -0500
Subject: Updated object backup feature to Meerkat's SVN, imported floater.

---
 linden/indra/newview/primbackup.cpp                    | 18 +++++++++++-------
 linden/indra/newview/primbackup.h                      |  1 +
 .../skins/default/xui/en-us/floater_prim_import.xml    |  5 +++++
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml

(limited to 'linden')

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
 	public:
 
 	importResponder(const LLSD& post_data,
-															   const LLUUID& vfile_id,
-															   LLAssetType::EType asset_type)
+		const LLUUID& vfile_id,
+		LLAssetType::EType asset_type)
 	: LLNewAgentInventoryResponder(post_data, vfile_id, asset_type)
 	{
 	}
@@ -229,9 +229,9 @@ primbackup::primbackup()
 	LLUICtrlFactory::getInstance()->buildFloater( this, "floater_prim_import.xml" );
 
 	// reposition floater from saved settings
-	LLRect rect = gSavedSettings.getRect( "FloaterPrimImport" );
-	reshape( rect.getWidth(), rect.getHeight(), FALSE );
-	setRect( rect );
+	//LLRect rect = gSavedSettings.getRect( "FloaterPrimImport" );
+	//reshape( rect.getWidth(), rect.getHeight(), FALSE );
+	//setRect( rect );
 
 	running=false;
 	textures.clear();
@@ -365,7 +365,7 @@ void primbackup::exportworker(void *userdata)
 					{
 						virtual bool apply(LLSelectNode* node)
 						{
-							if(gAgent.getID()!=node->mPermissions->getCreator())
+							if(gAgent.getID()!=node->mPermissions->getOwner())
 							{
 								#ifdef LL_GRID_PERMISSIONS
 									return false;
@@ -373,7 +373,11 @@ void primbackup::exportworker(void *userdata)
 									return true;
 								#endif
 							}
-							return true;
+							else if(581632==node->mPermissions->getMaskOwner() || 2147483647==node->mPermissions->getMaskOwner())
+							{
+								return true;
+							}
+							return false;
 						}
 				} func;
 
diff --git a/linden/indra/newview/primbackup.h b/linden/indra/newview/primbackup.h
index ee4cb29..fddc35f 100644
--- a/linden/indra/newview/primbackup.h
+++ b/linden/indra/newview/primbackup.h
@@ -129,3 +129,4 @@ private:
 	LLQuaternion agent_rot;
 
 };
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml b/linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml
new file mode 100644
index 0000000..191b31e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="true" can_minimize="false"
+     can_resize="false" height="80" name="Import" title="Import progress" width="200" mouse_opaque="true">
+  <text height="15" left="10" name="name_label" top="-10"> Progress </text>  
+</floater>
-- 
cgit v1.1