1 files changed, 119 insertions, 104 deletions

diff --git a/linden/indra/newview/primbackup.h b/linden/indra/newview/primbackup.h
index cbd757a..97dd489 100644
--- a/linden/indra/newview/primbackup.h
+++ b/linden/indra/newview/primbackup.h
@@ -1,134 +1,149 @@
 
 #include "llviewerinventory.h"
 
-#define LL_GRID_PERMISSIONS 1
-
-enum export_states {EXPORT_INIT,EXPORT_STRUCTURE,EXPORT_TEXTURES,EXPORT_LLSD,EXPORT_DONE};
-
-class primbackup :      public LLFloater
+enum export_states {
+        EXPORT_INIT,
+        EXPORT_STRUCTURE,
+        EXPORT_TEXTURES,
+        EXPORT_LLSD,
+        EXPORT_DONE,
+        EXPORT_FAILED
+};
 
+class PrimBackup : public LLFloater
 {
-        public:
-        //Export state machine
-        enum export_states export_state; 
-        
-        //Export idle callback
-        static void exportworker(void *userdata);
-
-        //Static accessor
-        static primbackup* getInstance();
-
-  static bool check_perms( LLSelectNode* node );
-
-        virtual ~primbackup();
-        
-        //Floater stuff
-        virtual void show();
+public:
+        virtual ~PrimBackup();
+
+        // Floater stuff
+        virtual void show(bool exporting);
         virtual void draw();
-        virtual void onClose( bool app_quitting );
+        virtual void onClose(bool app_quitting);
 
-        //Import entry point
-        void import_object(bool upload=FALSE);
-        
-        //Export entry point
-        void pre_export_object();
+        // Static accessor
+        static PrimBackup* getInstance();
 
-        //Update map from texture worker
-        void update_map(LLUUID uploaded_asset);
+        // Export idle callback
+        static void exportWorker(void *userdata);
 
-        //Move to next texture upload
-        void upload_next_asset();
+        // Import entry point
+        void importObject(bool upload=FALSE);
 
-        // is ready for next texture?
-        bool m_nexttextureready;
+        // Export entry point
+        void exportObject();
 
-        //Folder public geter
-        std::string getfolder() {return folder;};
+        // Update map from texture worker
+        void updateMap(LLUUID uploaded_asset);
 
-        //Prim updated callback
-        void prim_update(LLViewerObject* object);
+        // Move to next texture upload
+        void uploadNextAsset();
 
-        //New prim call back
-        bool newprim(LLViewerObject * pobject);
+        // Folder public geter
+        std::string getfolder() { return mFolder; };
 
-private:
+        // Prim updated callback
+        void primUpdate(LLViewerObject* object);
 
-        //Static singleton stuff
-        primbackup();   
-        static primbackup* sInstance;
+        // New prim call back
+        bool newPrim(LLViewerObject* pobject);
 
-        // are we active flag
-        bool running;
+        static const U32 TEXTURE_OK = 0x00;
+        static const U32 TEXTURE_BAD_PERM = 0x01;
+        static const U32 TEXTURE_MISSING = 0x02;
+        static const U32 TEXTURE_BAD_ENCODING = 0x04;
+        static const U32 TEXTURE_IS_NULL = 0x08;
+        static const U32 TEXTURE_SAVED_FAILED = 0x10;
 
-        //file and folder name control 
-        std::string file_name;
-        std::string folder;
+        // Is ready for next texture?
+        bool mNextTextureReady;
 
-        // True if we need to rebase the assets
-        bool m_retexture;
+        // Export state machine
+        enum export_states mExportState;
 
-        //Counts of import and export objects and textures and prims
-        int m_objects,m_curobject;
-        int m_prims,m_curprim;
-        int m_textures,m_curtexture;
+        // Export result flags for textures.
+        U32 mNonExportedTextures;
 
-        // No prims rezed
-        int rezcount;
+        static bool validatePerms(const LLPermissions* item_permissions);
+
+private:
+        // Static singleton stuff
+        PrimBackup();
+        static PrimBackup* sInstance;
 
         // Update the floater with status numbers
-        void updateimportnumbers();
-        void updateexportnumbers();
+        void updateImportNumbers();
+        void updateExportNumbers();
+
+        // Permissions stuff.
+        LLUUID validateTextureID(LLUUID asset_id);
+
+        // Convert a selection list of objects to LLSD
+        LLSD primsToLLSD(LLViewerObject::child_list_t child_list, bool is_attachment);
 
-        //Convert a selection list of objects to LLSD
-        LLSD prims_to_llsd(LLViewerObject::child_list_t child_list);
-                
         // Start the import process
-        void import_object1a();
+        void importFirstObject();
 
-        //Export the next texture in list
-        void export_next_texture();
+        // Move to the next import group
+        void importNextObject();
 
-        //apply LLSD to object
-        void xmltoprim(LLSD prim_llsd,LLViewerObject * pobject);
-        
+        // Export the next texture in list
+        void exportNextTexture();
 
-        //rez a prim at a given position (note not agent offset X/Y screen for raycast)
-        void rez_agent_offset(LLVector3 offset);        
-        
-        //Move to the next import group
-        void import_next_object();
-        
-        //Get an offset from the agent based on rotation and current pos
-        LLVector3 offset_agent(LLVector3 offset);
+        // Apply LLSD to object
+        void xmlToPrim(LLSD prim_llsd, LLViewerObject* pobject);
 
-        // Rebase map
-        std::map<LLUUID,LLUUID> assetmap;
-        
-        //Export texture list
-        std::list<LLUUID> textures;
-
-        //Import object tracking
-        std::vector<LLViewerObject *> toselect;
-        std::vector<LLViewerObject *>::iterator process_iter;
-
-        //Working LLSD holders
-        LLUUID current_asset;
-        LLSD llsd;
-        LLSD this_group;
-        LLUUID expecting_update;
-
-        //working llsd itterators for objects and linksets
-        LLSD::map_const_iterator prim_import_iter;
-        LLSD::array_const_iterator group_prim_import_iter;
-
-        // Root pos and central root pos for link set
-        LLVector3 root_pos;
-        LLVector3 root_root_pos;
-        LLVector3 group_offset;
-
-        //Agent inital pos and rot when starting import
-        LLQuaternion root_rot;
-        LLQuaternion agent_rot;
+        // Rez a prim at a given position (note not agent offset X/Y screen for raycast)
+        void rezAgentOffset(LLVector3 offset);
 
-};
+        // Get an offset from the agent based on rotation and current pos
+        LLVector3 offsetAgent(LLVector3 offset);
+
+        // Are we active flag
+        bool mRunning;
+
+        // File and folder name control
+        std::string mFileName;
+        std::string mFolder;
+
+        // True if we need to rebase the assets
+        bool mRetexture;
 
+        // Counts of import and export objects and prims
+        U32 mObjects;
+        U32 mCurObject;
+        U32 mPrims;
+        U32 mCurPrim;
+
+        // No prims rezed
+        U32 mRezCount;
+
+        // Rebase map
+        std::map<LLUUID,LLUUID> mAssetMap;
+
+        // Export texture list
+        std::list<LLUUID> mTexturesList;
+
+        // Import object tracking
+        std::vector<LLViewerObject*> mToSelect;
+        std::vector<LLViewerObject*>::iterator mProcessIter;
+
+        // Working LLSD holders
+        LLUUID mCurrentAsset;
+        LLSD mLLSD;
+        LLSD mThisGroup;
+        LLUUID mExpectingUpdate;
+
+        // Working llsd itterators for objects and linksets
+        LLSD::map_const_iterator mPrimImportIter;
+        LLSD::array_const_iterator mGroupPrimImportIter;
+
+        // Root pos and rotation and central root pos for link set
+        LLVector3 mRootPos;
+        LLQuaternion mRootRot;
+        LLVector3 mRootRootPos;
+        LLVector3 mGroupOffset;
+
+        // Agent inital pos and rot when starting import
+        LLVector3 mAgentPos;
+        LLQuaternion mAgentRot;
+};