From 090099a14ee243ec11e4d6a1804e2eaa936af2a0 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 26 Nov 2009 20:14:35 -0600 Subject: Reverted "Updated primbackup from latest meerkat svn (r246)" This reverts commit 8af226efd89b2f2190555ce578d4e7f1cde99f32. --- linden/indra/newview/primbackup.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'linden/indra/newview/primbackup.h') diff --git a/linden/indra/newview/primbackup.h b/linden/indra/newview/primbackup.h index 7db26ec..cbd757a 100644 --- a/linden/indra/newview/primbackup.h +++ b/linden/indra/newview/primbackup.h @@ -3,7 +3,7 @@ #define LL_GRID_PERMISSIONS 1 -//enum export_states {EXPORT_INIT,EXPORT_STRUCTURE,EXPORT_TEXTURES,EXPORT_LLSD,EXPORT_DONE}; +enum export_states {EXPORT_INIT,EXPORT_STRUCTURE,EXPORT_TEXTURES,EXPORT_LLSD,EXPORT_DONE}; class primbackup : public LLFloater @@ -13,7 +13,7 @@ class primbackup : public LLFloater enum export_states export_state; //Export idle callback - //static void exportworker(void *userdata); + static void exportworker(void *userdata); //Static accessor static primbackup* getInstance(); @@ -79,8 +79,6 @@ private: void updateimportnumbers(); void updateexportnumbers(); - //Convert a selection list of objects to HPA - LLXMLNode *prims_to_xml(LLViewerObject::child_list_t child_list); //Convert a selection list of objects to LLSD LLSD prims_to_llsd(LLViewerObject::child_list_t child_list); @@ -119,8 +117,6 @@ private: LLSD this_group; LLUUID expecting_update; - LLXMLNodePtr xml; - //working llsd itterators for objects and linksets LLSD::map_const_iterator prim_import_iter; LLSD::array_const_iterator group_prim_import_iter; @@ -135,3 +131,4 @@ private: LLQuaternion agent_rot; }; + -- cgit v1.1