aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-10-21 14:08:30 +0000
committerJeff Ames2008-10-21 14:08:30 +0000
commit0d4e391f75a8c7f50075245fc57fe78269865efe (patch)
treec2d9f3a7bc6cadda7af60902712dfc4ffce8f69f
parentfixing real cause of #2445 & #2449: Position was <0, 0, 0> for (diff)
downloadopensim-SC-0d4e391f75a8c7f50075245fc57fe78269865efe.zip
opensim-SC-0d4e391f75a8c7f50075245fc57fe78269865efe.tar.gz
opensim-SC-0d4e391f75a8c7f50075245fc57fe78269865efe.tar.bz2
opensim-SC-0d4e391f75a8c7f50075245fc57fe78269865efe.tar.xz
Update svn properties, minor formatting cleanup.
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs12
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs18
-rw-r--r--OpenSim/Region/Environment/Interfaces/IWindModule.cs82
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs4
6 files changed, 61 insertions, 61 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index badbb08..643361a 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -49,16 +49,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
49 /// Supported authentication schemes 49 /// Supported authentication schemes
50 /// </summary> 50 /// </summary>
51 51
52 public const string AS_BASIC = "Basic"; // simple user/password verification 52 public const string AS_BASIC = "Basic"; // simple user/password verification
53 public const string AS_DIGEST = "Digest"; // password safe authentication 53 public const string AS_DIGEST = "Digest"; // password safe authentication
54 54
55 /// Supported Digest algorithms 55 /// Supported Digest algorithms
56 56
57 public const string Digest_MD5 = "MD5"; // assumed default if omitted 57 public const string Digest_MD5 = "MD5"; // assumed default if omitted
58 public const string Digest_MD5Sess = "MD5-sess"; // session-span - not good for REST? 58 public const string Digest_MD5Sess = "MD5-sess"; // session-span - not good for REST?
59 59
60 public const string Qop_Auth = "auth"; // authentication only 60 public const string Qop_Auth = "auth"; // authentication only
61 public const string Qop_Int = "auth-int"; // TODO 61 public const string Qop_Int = "auth-int"; // TODO
62 62
63 /// <summary> 63 /// <summary>
64 /// These values have a single value for the whole 64 /// These values have a single value for the whole
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 11cda6e..0775007 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -67,11 +67,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
67 67
68 if (Rest.AvatarServices == null) 68 if (Rest.AvatarServices == null)
69 throw new Exception(String.Format("{0} OpenSim inventory services are not available", 69 throw new Exception(String.Format("{0} OpenSim inventory services are not available",
70 MsgId)); 70 MsgId));
71 71
72 if (Rest.UserServices == null) 72 if (Rest.UserServices == null)
73 throw new Exception(String.Format("{0} OpenSim user profile services are not available", 73 throw new Exception(String.Format("{0} OpenSim user profile services are not available",
74 MsgId)); 74 MsgId));
75 75
76 // If a relative path was specified for the handler's domain, 76 // If a relative path was specified for the handler's domain,
77 // add the standard prefix to make it absolute, e.g. /admin 77 // add the standard prefix to make it absolute, e.g. /admin
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
index f9abc49..2af26f2 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
@@ -56,7 +56,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
56 56
57 if (Rest.AssetServices == null) 57 if (Rest.AssetServices == null)
58 throw new Exception(String.Format("{0} OpenSim asset services are not available", 58 throw new Exception(String.Format("{0} OpenSim asset services are not available",
59 MsgId)); 59 MsgId));
60 60
61 // If the handler specifies a relative path for its domain 61 // If the handler specifies a relative path for its domain
62 // then we must add the standard absolute prefix, e.g. /admin 62 // then we must add the standard absolute prefix, e.g. /admin
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index 003c6ee..db7d1bd 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -296,15 +296,15 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
296 MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); 296 MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
297 297
298 298
299 lock (rdata) 299 lock (rdata)
300 { 300 {
301 if (!rdata.HaveInventory) 301 if (!rdata.HaveInventory)
302 { 302 {
303 rdata.startWD(1000); 303 rdata.startWD(1000);
304 rdata.timeout = false; 304 rdata.timeout = false;
305 Monitor.Wait(rdata); 305 Monitor.Wait(rdata);
306 } 306 }
307 } 307 }
308 308
309 if (rdata.timeout) 309 if (rdata.timeout)
310 { 310 {
diff --git a/OpenSim/Region/Environment/Interfaces/IWindModule.cs b/OpenSim/Region/Environment/Interfaces/IWindModule.cs
index 63a95d3..9896c56 100644
--- a/OpenSim/Region/Environment/Interfaces/IWindModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IWindModule.cs
@@ -1,41 +1,41 @@
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 OpenSim Project nor the 12 * * Neither the name of the OpenSim 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
28using System; 28using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenMetaverse; 30using OpenMetaverse;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Environment.Interfaces
33{ 33{
34 public interface IWindModule : IRegionModule 34 public interface IWindModule : IRegionModule
35 { 35 {
36 Vector2[] WindSpeeds 36 Vector2[] WindSpeeds
37 { 37 {
38 get; 38 get;
39 } 39 }
40 } 40 }
41} 41}
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
index 0eb303c..dd40a32 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
237 237
238 public void AddScene(Scene scene) 238 public void AddScene(Scene scene)
239 { 239 {
240 lock(m_syncConnect) m_scenes.Add(scene); 240 lock (m_syncConnect) m_scenes.Add(scene);
241 } 241 }
242 242
243 public bool Connect() 243 public bool Connect()
@@ -707,4 +707,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
707 } 707 }
708 } 708 }
709 } 709 }
710} \ No newline at end of file 710}