Done a little bit of renaming in primitive.cs and on a few events in IClientAPI.

Disabled CAPS asset uploading as it seems it now crashes the server.

2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index 6206f65..fdc21cf 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Capabilities
             string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + m_capsObjectPath;

             

             caps.MapLayer = capsBaseUrl + m_mapLayerPath;

-            caps.NewFileAgentInventory = capsBaseUrl + m_newInventory;

+          //  caps.NewFileAgentInventory = capsBaseUrl + m_newInventory;

             

             return caps;

         }

diff --git a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
index 1522559..1f8b242 100644
--- a/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
+++ b/OpenSim/Region/Capabilities/LLSDCapsDetails.cs
@@ -4,7 +4,7 @@ namespace OpenSim.Region.Capabilities
     public class LLSDCapsDetails

     {

         public string MapLayer = "";

-        public string NewFileAgentInventory = "";

+        //public string NewFileAgentInventory = "";

         //public string EventQueueGet = "";

 

         public LLSDCapsDetails()