3 files changed, 9 insertions, 8 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index a02ef9d..dd410a7 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -350,17 +350,18 @@ namespace OpenSim.Region.ClientStack.Linden
         public string SeedCapRequest(string request, string path, string param,
                                   IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
+            UUID agentID = m_HostCapsObj.AgentID;
             m_log.DebugFormat(
-                "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID);
+                "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, agentID);
 
             if (!m_HostCapsObj.WaitForActivation())
                 return string.Empty;
 
-            if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint))
+            if (!m_Scene.CheckClient(agentID, httpRequest.RemoteIPEndPoint))
             {
                 m_log.WarnFormat(
                     "[CAPS]: Unauthorized CAPS client {0} from {1}",
-                    m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint);
+                    agentID, httpRequest.RemoteIPEndPoint);
 
                 return string.Empty;
             }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
index b044e56..adb49bd 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            UUID capuuid = UUID.Random();
+            string capUrl = "/CAPS/" + UUID.Random() + "/";
 
             //            m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/");
 
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 "ObjectAdd",
                 new RestHTTPHandler(
                     "POST",
-                    "/CAPS/OA/" + capuuid + "/",
+                    capUrl,
                     httpMethod => ProcessAdd(httpMethod, agentID, caps),
                     "ObjectAdd",
                     agentID.ToString())); ;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index 116c51f..04d11cb 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
@@ -103,14 +103,14 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            UUID capID = UUID.Random();
+            string capUrl = "/CAPS/" + UUID.Random() + "/";
 
-//            m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID);
+            // m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID);
             caps.RegisterHandler(
                 "UploadObjectAsset",
                 new RestHTTPHandler(
                     "POST",
-                    "/CAPS/OA/" + capID + "/",
+                    capUrl,
                     httpMethod => ProcessAdd(httpMethod, agentID, caps),
                     "UploadObjectAsset",
                     agentID.ToString()));