1 files changed, 62 insertions, 62 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs
index a90eaa9..fb8a58e 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Capabilities/CapsUtil.cs
@@ -1,62 +1,62 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
+ *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenMetaverse;
+using OpenMetaverse;
-namespace OpenSim.Framework.Communications.Capabilities
+namespace OpenSim.Framework.Communications.Capabilities
-{    
+{    
-    /// <summary>
+    /// <summary>
-    /// Capabilities utility methods
+    /// Capabilities utility methods
-    /// </summary>
+    /// </summary>
-    public class CapsUtil
+    public class CapsUtil
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// Generate a CAPS seed path using a previously generated CAPS object path component
+        /// Generate a CAPS seed path using a previously generated CAPS object path component
-        /// </summary>
+        /// </summary>
-        /// <param name="capsKey"></param>
+        /// <param name="capsKey"></param>
-        /// <returns></returns>
+        /// <returns></returns>
-        public static string GetCapsSeedPath(string capsObjectPath)
+        public static string GetCapsSeedPath(string capsObjectPath)
-        {
+        {
-            return "/CAPS/" + capsObjectPath + "0000/";
+            return "/CAPS/" + capsObjectPath + "0000/";
-        }
+        }
-        
+        
-        /// <summary>
+        /// <summary>
-        /// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
+        /// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        public static string GetRandomCapsObjectPath()
+        public static string GetRandomCapsObjectPath()
-        {
+        {
-            UUID caps = UUID.Random();
+            UUID caps = UUID.Random();
-            string capsPath = caps.ToString();
+            string capsPath = caps.ToString();
-            // I'm commenting this, rather than delete, to keep as historical record.
+            // I'm commenting this, rather than delete, to keep as historical record.
-            // The caps seed is now a full UUID string that gets added four more digits
+            // The caps seed is now a full UUID string that gets added four more digits
-            // for producing certain CAPs URLs in OpenSim
+            // for producing certain CAPs URLs in OpenSim
-            //capsPath = capsPath.Remove(capsPath.Length - 4, 4);
+            //capsPath = capsPath.Remove(capsPath.Length - 4, 4);
-            return capsPath;
+            return capsPath;
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs index a90eaa9..fb8a58e 100644 --- a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs +++ b/OpenSim/Framework/Capabilities/CapsUtil.cs
@@ -1,62 +1,62 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSimulator Project nor the	12	* * Neither the name of the OpenSimulator Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using OpenMetaverse;	28	using OpenMetaverse;
29		29
30	namespace OpenSim.Framework.Communications.Capabilities	30	namespace OpenSim.Framework.Communications.Capabilities
31	{	31	{
32	/// <summary>	32	/// <summary>
33	/// Capabilities utility methods	33	/// Capabilities utility methods
34	/// </summary>	34	/// </summary>
35	public class CapsUtil	35	public class CapsUtil
36	{	36	{
37	/// <summary>	37	/// <summary>
38	/// Generate a CAPS seed path using a previously generated CAPS object path component	38	/// Generate a CAPS seed path using a previously generated CAPS object path component
39	/// </summary>	39	/// </summary>
40	/// <param name="capsKey"></param>	40	/// <param name="capsKey"></param>
41	/// <returns></returns>	41	/// <returns></returns>
42	public static string GetCapsSeedPath(string capsObjectPath)	42	public static string GetCapsSeedPath(string capsObjectPath)
43	{	43	{
44	return "/CAPS/" + capsObjectPath + "0000/";	44	return "/CAPS/" + capsObjectPath + "0000/";
45	}	45	}
46		46
47	/// <summary>	47	/// <summary>
48	/// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests	48	/// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
49	/// </summary>	49	/// </summary>
50	/// <returns></returns>	50	/// <returns></returns>
51	public static string GetRandomCapsObjectPath()	51	public static string GetRandomCapsObjectPath()
52	{	52	{
53	UUID caps = UUID.Random();	53	UUID caps = UUID.Random();
54	string capsPath = caps.ToString();	54	string capsPath = caps.ToString();
55	// I'm commenting this, rather than delete, to keep as historical record.	55	// I'm commenting this, rather than delete, to keep as historical record.
56	// The caps seed is now a full UUID string that gets added four more digits	56	// The caps seed is now a full UUID string that gets added four more digits
57	// for producing certain CAPs URLs in OpenSim	57	// for producing certain CAPs URLs in OpenSim
58	//capsPath = capsPath.Remove(capsPath.Length - 4, 4);	58	//capsPath = capsPath.Remove(capsPath.Length - 4, 4);
59	return capsPath;	59	return capsPath;
60	}	60	}
61	}	61	}
62	}	62	}