Added the 'Return to World' inventory option

6 files changed, 177 insertions, 19 deletions

diff --git a/linden/indra/lib/python/indra/base/llsd.py b/linden/indra/lib/python/indra/base/llsd.py
index 521b79c..e6141b6 100644
--- a/linden/indra/lib/python/indra/base/llsd.py
+++ b/linden/indra/lib/python/indra/base/llsd.py
@@ -36,10 +36,13 @@ import re
 from indra.util.fastest_elementtree import ElementTreeError, fromstring
 from indra.base import lluuid
 
-try:
-    import cllsd
-except ImportError:
-    cllsd = None
+# cllsd.c in server/server-1.25 has memory leaks,
+#   so disabling cllsd for now
+#try:
+#    import cllsd
+#except ImportError:
+#    cllsd = None
+cllsd = None
 
 int_regex = re.compile(r"[-+]?\d+")
 real_regex = re.compile(r"[-+]?(\d+(\.\d*)?|\d*\.\d+)([eE][-+]?\d+)?")
@@ -47,7 +50,7 @@ alpha_regex = re.compile(r"[a-zA-Z]+")
 date_regex = re.compile(r"(?P<year>\d{4})-(?P<month>\d{2})-(?P<day>\d{2})T"
                         r"(?P<hour>\d{2}):(?P<minute>\d{2}):(?P<second>\d{2})"
                         r"(?P<second_float>(\.\d+)?)Z")
-#date: d"YYYY-MM-DDTHH:MM:SS.FFZ"
+#date: d"YYYY-MM-DDTHH:MM:SS.FFFFFFZ"
 
 class LLSDParseError(Exception):
     pass
@@ -69,14 +72,7 @@ BOOL_FALSE = ('0', '0.0', 'false', '')
 
 def format_datestr(v):
     """ Formats a datetime object into the string format shared by xml and notation serializations."""
-    second_str = ""
-    if v.microsecond > 0:
-        seconds = v.second + float(v.microsecond) / 1e6
-        second_str = "%05.2f" % seconds
-    else:
-        second_str = "%02d" % v.second
-    return '%s%sZ' % (v.strftime('%Y-%m-%dT%H:%M:'), second_str)
-
+    return v.isoformat() + 'Z'
 
 def parse_datestr(datestr):
     """Parses a datetime object from the string format shared by xml and notation serializations."""
@@ -133,6 +129,7 @@ def date_to_python(node):
     if not val:
         val = "1970-01-01T00:00:00Z"
     return parse_datestr(val)
+    
 
 def uri_to_python(node):
     val = node.text or ''
@@ -969,6 +966,9 @@ class LLSD(object):
 
 undef = LLSD(None)
 
+XML_MIME_TYPE = 'application/llsd+xml'
+BINARY_MIME_TYPE = 'application/llsd+binary'
+
 # register converters for llsd in mulib, if it is available
 try:
     from mulib import stacked, mu
@@ -978,7 +978,7 @@ except:
     # mulib not available, don't print an error message since this is normal
     pass
 else:
-    mu.add_parser(parse, 'application/llsd+xml')
+    mu.add_parser(parse, XML_MIME_TYPE)
     mu.add_parser(parse, 'application/llsd+binary')
 
     def llsd_convert_xml(llsd_stuff, request):
@@ -987,11 +987,58 @@ else:
     def llsd_convert_binary(llsd_stuff, request):
         request.write(format_binary(llsd_stuff))
 
-    for typ in [LLSD, dict, list, tuple, str, int, float, bool, unicode, type(None)]:
-        stacked.add_producer(typ, llsd_convert_xml, 'application/llsd+xml')
+    for typ in [LLSD, dict, list, tuple, str, int, long, float, bool, unicode, type(None)]:
+        stacked.add_producer(typ, llsd_convert_xml, XML_MIME_TYPE)
         stacked.add_producer(typ, llsd_convert_xml, 'application/xml')
         stacked.add_producer(typ, llsd_convert_xml, 'text/xml')
 
         stacked.add_producer(typ, llsd_convert_binary, 'application/llsd+binary')
 
     stacked.add_producer(LLSD, llsd_convert_xml, '*/*')
+
+    # in case someone is using the legacy mu.xml wrapper, we need to
+    # tell mu to produce application/xml or application/llsd+xml
+    # (based on the accept header) from raw xml. Phoenix 2008-07-21
+    stacked.add_producer(mu.xml, mu.produce_raw, XML_MIME_TYPE)
+    stacked.add_producer(mu.xml, mu.produce_raw, 'application/xml')
+
+
+
+# mulib wsgi stuff
+# try:
+#     from mulib import mu, adapters
+#
+#     # try some known attributes from mulib to be ultra-sure we've imported it
+#     mu.get_current
+#     adapters.handlers
+# except:
+#     # mulib not available, don't print an error message since this is normal
+#     pass
+# else:
+#     def llsd_xml_handler(content_type):
+#         def handle_llsd_xml(env, start_response):
+#             llsd_stuff, _ = mu.get_current(env)
+#             result = format_xml(llsd_stuff)
+#             start_response("200 OK", [('Content-Type', content_type)])
+#             env['mu.negotiated_type'] = content_type
+#             yield result
+#         return handle_llsd_xml
+#    
+#     def llsd_binary_handler(content_type):
+#         def handle_llsd_binary(env, start_response):
+#             llsd_stuff, _ = mu.get_current(env)
+#             result = format_binary(llsd_stuff)
+#             start_response("200 OK", [('Content-Type', content_type)])
+#             env['mu.negotiated_type'] = content_type
+#             yield result
+#         return handle_llsd_binary
+#
+#     adapters.DEFAULT_PARSERS[XML_MIME_TYPE] = parse
+    
+#     for typ in [LLSD, dict, list, tuple, str, int, float, bool, unicode, type(None)]:
+#         for content_type in (XML_MIME_TYPE, 'application/xml'):
+#             adapters.handlers.set_handler(typ, llsd_xml_handler(content_type), content_type)
+#
+#         adapters.handlers.set_handler(typ, llsd_binary_handler(BINARY_MIME_TYPE), BINARY_MIME_TYPE)
+#
+#     adapters.handlers.set_handler(LLSD, llsd_xml_handler(XML_MIME_TYPE), '*/*')
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index fcb2aaf..023676a 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -77,6 +77,14 @@ enum LAND_STAT_REPORT_TYPE
 
 const U32 STAT_FILTER_MASK      = 0x1FFFFFFF;
 
+// Region absolute limits
+static const S32                REGION_AGENT_COUNT_MIN = 1;
+static const S32                REGION_AGENT_COUNT_MAX = 200;                   // Must fit in U8 for the moment (RegionInfo msg)
+static const S32                REGION_PRIM_COUNT_MIN = 0;
+static const S32                REGION_PRIM_COUNT_MAX = 40000;
+static const F32                REGION_PRIM_BONUS_MIN = 1.0;
+static const F32                REGION_PRIM_BONUS_MAX = 10.0;
+
 // Default maximum number of tasks/prims per region.
 const U32 DEFAULT_MAX_REGION_WIDE_PRIM_COUNT = 15000;
 
@@ -229,10 +237,11 @@ const S32 KEY_COUNT = 256;
 const F32 DEFAULT_WATER_HEIGHT  = 20.0f;
 
 // Maturity ratings for simulators
-const U8 SIM_ACCESS_MIN         = 0;
+const U8 SIM_ACCESS_MIN         = 0;            // Treated as 'unknown', usually ends up being SIM_ACCESS_PG
 const U8 SIM_ACCESS_TRIAL       = 7;
 const U8 SIM_ACCESS_PG          = 13;
 const U8 SIM_ACCESS_MATURE      = 21;
+const U8 SIM_ACCESS_ADULT       = 42;           // Seriously Adult Only
 const U8 SIM_ACCESS_DOWN        = 254;
 const U8 SIM_ACCESS_MAX         = SIM_ACCESS_MATURE;
 
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index bde36cc..34277f7 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -756,6 +756,10 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model,
                 model->deleteObject(mUUID);
                 model->notifyObservers();
         }
+        else if ("restoreToWorld" == action)
+        {
+                restoreToWorld();
+        }
         else if ("restore" == action)
         {
                 restoreItem();
@@ -812,6 +816,47 @@ void LLItemBridge::restoreItem()
         }
 }
 
+void LLItemBridge::restoreToWorld()
+{
+        LLViewerInventoryItem* itemp = (LLViewerInventoryItem*)getItem();
+        if (itemp)
+        {
+                LLMessageSystem* msg = gMessageSystem;
+                msg->newMessage("RezRestoreToWorld");
+                msg->nextBlockFast(_PREHASH_AgentData);
+                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+
+                msg->nextBlockFast(_PREHASH_InventoryData);
+                itemp->packMessage(msg);
+                msg->sendReliable(gAgent.getRegion()->getHost());
+        }
+
+        //Similar functionality to the drag and drop rez logic
+        BOOL remove_from_inventory = FALSE;
+
+        //remove local inventory copy, sim will deal with permissions and removing the item
+        //from the actual inventory if its a no-copy etc
+        if(!itemp->getPermissions().allowCopyBy(gAgent.getID()))
+        {
+                remove_from_inventory = TRUE;
+        }
+
+        // Check if it's in the trash. (again similar to the normal rez logic)
+        LLUUID trash_id;
+        trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
+        if(gInventory.isObjectDescendentOf(itemp->getUUID(), trash_id))
+        {
+                remove_from_inventory = TRUE;
+        }
+
+        if(remove_from_inventory)
+        {
+                gInventory.deleteObject(itemp->getUUID());
+                gInventory.notifyObservers();
+        }
+}
+
 LLUIImagePtr LLItemBridge::getIcon() const
 {
         return LLUI::getUIImage(ICON_NAME[OBJECT_ICON_NAME]);
@@ -3376,6 +3421,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                                 items.push_back(std::string("Object Wear"));
                                 items.push_back(std::string("Attach To"));
                                 items.push_back(std::string("Attach To HUD"));
+                                items.push_back(std::string("Restore to Last Position"));
 
                                 LLMenuGL* attach_menu = menu.getChildMenuByName("Attach To", TRUE);
                                 LLMenuGL* attach_hud_menu = menu.getChildMenuByName("Attach To HUD", TRUE);
@@ -4364,7 +4410,6 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                 items.push_back(std::string("Wearable Wear"));
                 items.push_back(std::string("Wearable Edit"));
 
-
                 if ((flags & FIRST_SELECTED_ITEM) == 0)
                 {
                         disabled_items.push_back(std::string("Wearable Edit"));
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index 329e57f..eb17432 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -159,6 +159,7 @@ public:
 
         virtual const std::string& getPrefix() { return LLStringUtil::null; }
         virtual void restoreItem() {}
+        virtual void restoreToWorld() {}
 
         // LLFolderViewEventListener functions
         virtual const std::string& getName() const;
@@ -243,6 +244,7 @@ public:
 
         virtual void selectItem();
         virtual void restoreItem();
+        virtual void restoreToWorld();
 
         virtual LLUIImagePtr getIcon() const;
         virtual const std::string& getDisplayName() const;
@@ -283,7 +285,6 @@ public:
         virtual void selectItem();
         virtual void restoreItem();
 
-
         virtual LLUIImagePtr getIcon() const;
         virtual BOOL renameItem(const std::string& new_name);
         virtual BOOL removeItem();
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 31288ac..aa61e77 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -223,6 +223,10 @@
              mouse_opaque="true" name="Detach From Yourself" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
         </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Restore to Last Position" left="0" mouse_opaque="true"
+             name="Restore to Last Position" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
+        </menu_item_call>
         <menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
              name="Object Wear" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
diff --git a/linden/scripts/messages/message_template.msg b/linden/scripts/messages/message_template.msg
index a7835ad..6d90622 100644
--- a/linden/scripts/messages/message_template.msg
+++ b/linden/scripts/messages/message_template.msg
@@ -2942,6 +2942,14 @@ version 2.0
                 {       UseEstateSun            BOOL            }
                 {       SunHour                         F32                     }       // last value set by estate or region controls JC
         }
+        {
+                RegionInfo2             Single
+                {       ProductSKU                      Variable 1      }       // string
+                {       ProductName                     Variable 1      }       // string
+                {       MaxAgents32                     U32                     }       // Identical to RegionInfo.MaxAgents but allows greater range
+                {       HardMaxAgents           U32                     }
+                {       HardMaxObjects          U32                     }
+        }
 }
 
 // GodUpdateRegionInfo
@@ -3059,6 +3067,14 @@ version 2.0
                 RegionInfo2     Single
                 {       RegionID                LLUUID  }
         }
+        {
+                RegionInfo3     Single
+                {       CPUClassID                              S32             }
+                {       CPURatio                                S32             }
+                {       ColoName                                Variable        1       }       // string
+                {       ProductSKU                              Variable        1       }       // string
+                {       ProductName                             Variable        1       }       // string
+        }
 }
 
 // RegionHandshakeReply
@@ -8854,3 +8870,39 @@ version 2.0
         }
 }
 
+
+// This message is sent from viewer -> simulator when the viewer wants
+// to rez an object out of inventory back to its position before it
+// last moved into the inventory
+{
+        RezRestoreToWorld Low 425 NotTrusted Unencoded UDPDeprecated
+        {
+                AgentData               Single
+                {       AgentID         LLUUID  }
+                {       SessionID       LLUUID  }
+        }
+        {
+                InventoryData                   Single
+                {       ItemID                          LLUUID  }
+                {       FolderID                        LLUUID  }
+                {       CreatorID                       LLUUID  }       // permissions
+                {       OwnerID                         LLUUID  }       // permissions
+                {       GroupID                         LLUUID  }       // permissions
+                {       BaseMask                        U32     }       // permissions
+                {       OwnerMask                       U32     }       // permissions
+                {       GroupMask                       U32     }       // permissions
+                {       EveryoneMask            U32     }       // permissions
+                {       NextOwnerMask           U32     }       // permissions
+                {       GroupOwned                      BOOL    }       // permissions
+                {       TransactionID           LLUUID  }
+                {       Type                            S8      }
+                {       InvType                         S8      }
+                {       Flags                           U32     }
+                {       SaleType                        U8      }
+                {       SalePrice                       S32     }
+                {       Name                            Variable        1       }
+                {       Description                     Variable        1       }
+                {       CreationDate            S32     }
+                {       CRC                             U32     }
+        }
+}