Merge jacek/next into 1.2.0-next

8 files changed, 126 insertions, 115 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9b09fac..9e31c0f 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,34 @@
+2009-09-27  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Rearranged the Import stuff in the File menu.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Changed "Backup" to "Export" in object pie menu.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+
+
+        * Fixed and cleaned up the export permissions check.
+
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/primbackup.cpp
+          modified:   linden/indra/newview/primbackup.h
+
+
+        * Updated Imprudence version to "1.2.0 beta".
+
+          linden/indra/llcommon/llversionviewer.h
+
+
+        * Re-enabled "allow first life" userauth stuff.
+          It was commented out when grid manager was added, but it
+          makes certain Profile window pieces disappear.
+
+          modified:   linden/indra/newview/llstartup.cpp
+
+
 2009-09-27 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Show disabled buttons for own profile rather than hiding them.
@@ -63,7 +94,7 @@
 
 
         * Changes to make the grid manager compile on Windows.
-        
+
           modified:   linden/indra/newview/hippoGridManager.cpp
           modified:   linden/indra/newview/hippoLimits.cpp
           modified:   linden/indra/newview/hippoRestRequest.cpp
@@ -85,11 +116,11 @@
 
 2009-09-26 McCabe Maxsted  <hakushakukun@gmail.com>
 
-        * Made the windlight floater toggle.  
-          
+        * Made the windlight floater toggle.
+
           modified:   linden/indra/newview/llfloaterwindlight.cpp
-          
-          
+
+
         * Added select Torley Windlight presets to Imprudence.
           Presets good for photography, mainly.
           
@@ -142,14 +173,14 @@
           new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teak%20weak.xml
           new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wuxia%20nights.xml
           
-          
+
         * Removed overridden /oy compiler option.
-        
+
           modified:   linden/indra/cmake/00-Common.cmake
-        
-        
+
+
         * Changed radar label from 'meters' to 'm'.
-        
+
           modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
 
 
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 34fb615..b8f7ae8 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -43,8 +43,8 @@ const char * const LL_VIEWER_NAME = "Second Life";
 const char * const IMP_VIEWER_NAME = "Imprudence";
 
 const S32 IMP_VERSION_MAJOR = 1;
-const S32 IMP_VERSION_MINOR = 1;
+const S32 IMP_VERSION_MINOR = 2;
 const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "";
+const char * const IMP_VERSION_TEST = "beta";
 
 #endif
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 9b46054..6839a4f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2130,7 +2130,6 @@ bool idle_startup()
                         LLAvatarTracker::instance().addBuddyList(list);
                 }
 
-                /*
                 options.clear();
                 if(LLUserAuth::getInstance()->getOptions("ui-config", options))
                 {
@@ -2149,7 +2148,7 @@ bool idle_startup()
                                 }
                         }
                 }
-                */
+
                 options.clear();
                 bool show_hud = false;
                 if(LLUserAuth::getInstance()->getOptions("tutorial_setting", options))
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 0146f9e..ba24c16 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2307,56 +2307,32 @@ class LLObjectEnableExport : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
-                bool new_value = (object != NULL);
-                if (new_value)
-                {
-                        LLVOAvatar* avatar = find_avatar_from_object(object); 
-                        new_value = (avatar == NULL);
-                }
-                if(new_value)
+                LLControlVariable* control = 
+                        gMenuHolder->findControl(userdata["control"].asString());
+
+                LLViewerObject* object =
+                        LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+
+                if((object != NULL) &&
+                   (find_avatar_from_object(object) == NULL))
                 {
-                        
                         struct ff : public LLSelectedNodeFunctor
                         {
-                                ff(const LLSD& data) : LLSelectedNodeFunctor()
-                                ,userdata(data)
-                                {
-
-                                }
-                                const LLSD& userdata;
                                 virtual bool apply(LLSelectNode* node)
                                 {
-                                        if(gAgent.getID()!=node->mPermissions->getCreator())
-                                        {
-                                                return false;
-                                        }
-                                        return true;
+                                        return primbackup::check_perms( node );
                                 }
-                        };
- 
-#ifdef LL_GRID_PERMISSIONS
- 
-                        ff * the_ff=new ff(userdata);
-                        if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(the_ff,false))
-                        {
-                                        gMenuHolder->findControl(userdata["control"].asString())->setValue(true);
-                        }
-                        else
+                        } func;
+
+                        if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false))
                         {
-                                        gMenuHolder->findControl(userdata["control"].asString())->setValue(false);
+                                control->setValue(true);
+                                return true;    
                         }
-                        return true;    
                 }
  
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
-#else
-                }
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(true);
+                control->setValue(false);
                 return true;
-#endif
-
         }
 };
 
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 78fd482..8dbf1df 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -350,54 +350,52 @@ void primbackup::pre_export_object()
         gIdleCallbacks.addFunction(exportworker, NULL);
 }
 
+
+// static
+bool primbackup::check_perms( LLSelectNode* node )
+{
+        LLPermissions *perms = node->mPermissions;
+        return (gAgent.getID() == perms->getOwner() &&
+                gAgent.getID() == perms->getCreator() &&
+                (PERM_ITEM_UNRESTRICTED &
+                 perms->getMaskOwner()) == PERM_ITEM_UNRESTRICTED);
+}
+
+
 void primbackup::exportworker(void *userdata)
 {       
         primbackup::getInstance()->updateexportnumbers();
 
         switch(primbackup::getInstance()->export_state)
         {
-                case EXPORT_INIT:
+                case EXPORT_INIT: {
+                        primbackup::getInstance()->show();              
+                        LLSelectMgr::getInstance()->getSelection()->ref();
+
+                        struct ff : public LLSelectedNodeFunctor
                         {
-                                primbackup::getInstance()->show();              
-                                LLSelectMgr::getInstance()->getSelection()->ref();
-
-                                struct ff : public LLSelectedNodeFunctor
-                                        {
-                                                virtual bool apply(LLSelectNode* node)
-                                                {
-                                                        if(gAgent.getID()!=node->mPermissions->getOwner())
-                                                        {
-                                                                #ifdef LL_GRID_PERMISSIONS
-                                                                        return false;
-                                                                #else
-                                                                        return true;
-                                                                #endif
-                                                        }
-                                                        else if(581632==node->mPermissions->getMaskOwner() || 2147483647==node->mPermissions->getMaskOwner())
-                                                        {
-                                                                return true;
-                                                        }
-                                                        return false;
-                                                }
-                                } func;
-
-                                if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false))
-                                        primbackup::getInstance()->export_state=EXPORT_STRUCTURE;
-                                else
+                                virtual bool apply(LLSelectNode* node)
                                 {
-                                        llwarns<<"Incorrect permission to export"<<llendl;
-                                        primbackup::getInstance()->export_state=EXPORT_DONE;
-                                        primbackup::getInstance()->close();
-                                        gIdleCallbacks.deleteFunction(exportworker);
-                                        LLSelectMgr::getInstance()->getSelection()->unref();
-
+                                        return primbackup::check_perms( node );
                                 }
-                                break;
-                        }
+                        } func;
 
+                        if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false))
+                        {
+                                primbackup::getInstance()->export_state=EXPORT_STRUCTURE;
+                        }
+                        else
+                        {
+                                llwarns << "Incorrect permission to export" << llendl;
+                                primbackup::getInstance()->export_state=EXPORT_DONE;
+                                primbackup::getInstance()->close();
+                                gIdleCallbacks.deleteFunction(exportworker);
+                                LLSelectMgr::getInstance()->getSelection()->unref();
+                        }
                         break;
-                case EXPORT_STRUCTURE:
-                {
+                }
+
+                case EXPORT_STRUCTURE: {
                         struct ff : public LLSelectedObjectFunctor
                         {
                                 virtual bool apply(LLViewerObject* object)
@@ -405,7 +403,7 @@ void primbackup::exportworker(void *userdata)
                                         object->boostTexturePriority(TRUE);
                                         LLViewerObject::child_list_t children = object->getChildren();
                                         children.push_front(object); //push root onto list
-                                        LLSD prim_llsd=primbackup::getInstance()->prims_to_llsd(children);                              
+                                        LLSD prim_llsd=primbackup::getInstance()->prims_to_llsd(children);
                                         LLSD stuff;
                                         stuff["root_position"] = object->getPosition().getValue();
                                         stuff["root_rotation"] = ll_sd_from_quaternion(object->getRotation());
@@ -421,7 +419,8 @@ void primbackup::exportworker(void *userdata)
 
                         break;
                 }
-                case EXPORT_TEXTURES:
+
+                case EXPORT_TEXTURES: {
                         if(primbackup::getInstance()->m_nexttextureready==false)
                                 return;
 
@@ -435,23 +434,25 @@ void primbackup::exportworker(void *userdata)
                         }
 
                         primbackup::getInstance()->export_next_texture();
-                break;
+                        break;
+                }
 
-                case EXPORT_LLSD:
-                        {
-                                // Create a file stream and write to it
-                                llofstream export_file(primbackup::getInstance()->file_name);
-                                LLSDSerialize::toPrettyXML(primbackup::getInstance()->llsd, export_file);
-                                export_file.close();
-                                primbackup::getInstance()->m_nexttextureready=true;     
-                                primbackup::getInstance()->export_state=EXPORT_TEXTURES;
-                        }
+                case EXPORT_LLSD: {
+                        // Create a file stream and write to it
+                        llofstream export_file(primbackup::getInstance()->file_name);
+                        LLSDSerialize::toPrettyXML(primbackup::getInstance()->llsd, export_file);
+                        export_file.close();
+                        primbackup::getInstance()->m_nexttextureready=true;     
+                        primbackup::getInstance()->export_state=EXPORT_TEXTURES;
                         break;
-                case EXPORT_DONE:
-                                        llinfos<<"Backup complete"<<llendl
-                                        gIdleCallbacks.deleteFunction(exportworker);
-                                        primbackup::getInstance()->close();
+                }
+
+                case EXPORT_DONE: {
+                        llinfos << "Backup complete" << llendl;
+                        gIdleCallbacks.deleteFunction(exportworker);
+                        primbackup::getInstance()->close();
                         break;
+                }
         }
 }
 
diff --git a/linden/indra/newview/primbackup.h b/linden/indra/newview/primbackup.h
index fddc35f..cbd757a 100644
--- a/linden/indra/newview/primbackup.h
+++ b/linden/indra/newview/primbackup.h
@@ -18,6 +18,8 @@ class primbackup : 	public LLFloater
         //Static accessor
         static primbackup* getInstance();
 
+  static bool check_perms( LLSelectNode* node );
+
         virtual ~primbackup();
         
         //Floater stuff
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index 15cdc9e..2c7ca3c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -44,7 +44,7 @@
                         <on_enable function="Object.EnableReturn" />
                 </menu_item_call>
                 <pie_menu label="More &gt;" name="Rate Menu">
-      <menu_item_call label="Backup" enabled="false" hidden="false"
+      <menu_item_call label="Export" enabled="false" hidden="false"
                       mouse_opaqu="true" name="Export">
         <on_click function="Object.Export" />
         <on_enable function="Object.EnableExport" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 92b7008..9da0ec5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -8,14 +8,6 @@
 
   <menu name="File" create_jump_keys="true" label="File"
         opaque="true" tear_off="true">
-            <menu_item_call enabled="false" hidden="false" label="Import" mouse_opaque="true" name="Import">
-            <on_click function="Object.Import" />
-            <on_enable function="Object.EnableImport" />
-        </menu_item_call>
-        <menu_item_call enabled="false" hidden="false" label="Upload + Import" mouse_opaque="true" name="Import">
-            <on_click function="Object.ImportUpload" />
-            <on_enable function="Object.EnableImport" />
-    </menu_item_call>
     <menu_item_call name="Upload Image"
                     label="Upload Image (L$[COST])..."
                     shortcut="control|U">
@@ -37,6 +29,16 @@
       <on_click function="File.UploadBulk" userdata="" />
     </menu_item_call>
     <menu_item_separator />
+          <menu_item_call name="Import" label="Import" enabled="false">
+      <on_click function="Object.Import" />
+      <on_enable function="Object.EnableImport" />
+    </menu_item_call>
+    <menu_item_call name="Upload + Import" label="Upload + Import"
+                    enabled="false">
+      <on_click function="Object.ImportUpload" />
+      <on_enable function="Object.EnableImport" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_call name="Close Window"
                     label="Close Window"
                     shortcut="control|W">