diff options
Diffstat (limited to 'OpenSim/Services')
92 files changed, 505 insertions, 505 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index c57db48..5c37c33 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -95,7 +95,7 @@ namespace OpenSim.Services.AssetService | |||
95 | public virtual AssetBase Get(string id) | 95 | public virtual AssetBase Get(string id) |
96 | { | 96 | { |
97 | // m_log.DebugFormat("[ASSET SERVICE]: Get asset for {0}", id); | 97 | // m_log.DebugFormat("[ASSET SERVICE]: Get asset for {0}", id); |
98 | 98 | ||
99 | UUID assetID; | 99 | UUID assetID; |
100 | 100 | ||
101 | if (!UUID.TryParse(id, out assetID)) | 101 | if (!UUID.TryParse(id, out assetID)) |
@@ -166,7 +166,7 @@ namespace OpenSim.Services.AssetService | |||
166 | return new bool[ids.Length]; | 166 | return new bool[ids.Length]; |
167 | } | 167 | } |
168 | } | 168 | } |
169 | 169 | ||
170 | public virtual string Store(AssetBase asset) | 170 | public virtual string Store(AssetBase asset) |
171 | { | 171 | { |
172 | bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0]; | 172 | bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0]; |
@@ -175,14 +175,14 @@ namespace OpenSim.Services.AssetService | |||
175 | // m_log.DebugFormat( | 175 | // m_log.DebugFormat( |
176 | // "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length); | 176 | // "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length); |
177 | if (!m_Database.StoreAsset(asset)) | 177 | if (!m_Database.StoreAsset(asset)) |
178 | { | 178 | { |
179 | return UUID.Zero.ToString(); | 179 | return UUID.Zero.ToString(); |
180 | } | 180 | } |
181 | } | 181 | } |
182 | // else | 182 | // else |
183 | // { | 183 | // { |
184 | // m_log.DebugFormat( | 184 | // m_log.DebugFormat( |
185 | // "[ASSET SERVICE]: Not storing asset {0} {1}, bytes {2} as it already exists", asset.Name, asset.FullID, asset.Data.Length); | 185 | // "[ASSET SERVICE]: Not storing asset {0} {1}, bytes {2} as it already exists", asset.Name, asset.FullID, asset.Data.Length); |
186 | // } | 186 | // } |
187 | 187 | ||
188 | return asset.ID; | 188 | return asset.ID; |
diff --git a/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs b/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs index ddcb997..8da7100 100644 --- a/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/AssetService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.AssetService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.AssetService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs index b1e5184..9490d55 100644 --- a/OpenSim/Services/AssetService/XAssetService.cs +++ b/OpenSim/Services/AssetService/XAssetService.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Services.AssetService | |||
94 | public virtual AssetBase Get(string id) | 94 | public virtual AssetBase Get(string id) |
95 | { | 95 | { |
96 | // m_log.DebugFormat("[ASSET SERVICE]: Get asset for {0}", id); | 96 | // m_log.DebugFormat("[ASSET SERVICE]: Get asset for {0}", id); |
97 | 97 | ||
98 | UUID assetID; | 98 | UUID assetID; |
99 | 99 | ||
100 | if (!UUID.TryParse(id, out assetID)) | 100 | if (!UUID.TryParse(id, out assetID)) |
@@ -162,7 +162,7 @@ namespace OpenSim.Services.AssetService | |||
162 | public virtual bool Get(string id, Object sender, AssetRetrieved handler) | 162 | public virtual bool Get(string id, Object sender, AssetRetrieved handler) |
163 | { | 163 | { |
164 | //m_log.DebugFormat("[XASSET SERVICE]: Get asset async {0}", id); | 164 | //m_log.DebugFormat("[XASSET SERVICE]: Get asset async {0}", id); |
165 | 165 | ||
166 | UUID assetID; | 166 | UUID assetID; |
167 | 167 | ||
168 | if (!UUID.TryParse(id, out assetID)) | 168 | if (!UUID.TryParse(id, out assetID)) |
@@ -171,7 +171,7 @@ namespace OpenSim.Services.AssetService | |||
171 | AssetBase asset = Get(id); | 171 | AssetBase asset = Get(id); |
172 | 172 | ||
173 | //m_log.DebugFormat("[XASSET SERVICE]: Got asset {0}", asset); | 173 | //m_log.DebugFormat("[XASSET SERVICE]: Got asset {0}", asset); |
174 | 174 | ||
175 | handler(id, sender, asset); | 175 | handler(id, sender, asset); |
176 | 176 | ||
177 | return true; | 177 | return true; |
@@ -182,7 +182,7 @@ namespace OpenSim.Services.AssetService | |||
182 | UUID[] uuid = Array.ConvertAll(ids, id => UUID.Parse(id)); | 182 | UUID[] uuid = Array.ConvertAll(ids, id => UUID.Parse(id)); |
183 | return m_Database.AssetsExist(uuid); | 183 | return m_Database.AssetsExist(uuid); |
184 | } | 184 | } |
185 | 185 | ||
186 | public virtual string Store(AssetBase asset) | 186 | public virtual string Store(AssetBase asset) |
187 | { | 187 | { |
188 | bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0]; | 188 | bool exists = m_Database.AssetsExist(new[] { asset.FullID })[0]; |
@@ -222,7 +222,7 @@ namespace OpenSim.Services.AssetService | |||
222 | 222 | ||
223 | private void MigrateFromChainedService(AssetBase asset) | 223 | private void MigrateFromChainedService(AssetBase asset) |
224 | { | 224 | { |
225 | Store(asset); | 225 | Store(asset); |
226 | m_ChainedAssetService.Delete(asset.ID); | 226 | m_ChainedAssetService.Delete(asset.ID); |
227 | } | 227 | } |
228 | } | 228 | } |
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs index e42f9a0..f66b4e2 100644 --- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs +++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Services.AuthenticationService | |||
41 | // Generic Authentication service used for identifying | 41 | // Generic Authentication service used for identifying |
42 | // and authenticating principals. | 42 | // and authenticating principals. |
43 | // Principals may be clients acting on users' behalf, | 43 | // Principals may be clients acting on users' behalf, |
44 | // or any other components that need | 44 | // or any other components that need |
45 | // verifiable identification. | 45 | // verifiable identification. |
46 | // | 46 | // |
47 | public class AuthenticationServiceBase : ServiceBase | 47 | public class AuthenticationServiceBase : ServiceBase |
@@ -49,7 +49,7 @@ namespace OpenSim.Services.AuthenticationService | |||
49 | private static readonly ILog m_log = | 49 | private static readonly ILog m_log = |
50 | LogManager.GetLogger( | 50 | LogManager.GetLogger( |
51 | MethodBase.GetCurrentMethod().DeclaringType); | 51 | MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | protected IAuthenticationData m_Database; | 53 | protected IAuthenticationData m_Database; |
54 | protected IUserAccountService m_UserAccountService = null; | 54 | protected IUserAccountService m_UserAccountService = null; |
55 | 55 | ||
@@ -178,7 +178,7 @@ namespace OpenSim.Services.AuthenticationService | |||
178 | m_log.DebugFormat("[AUTHENTICATION DB]: Set authentication info for principalID {0}", info.PrincipalID); | 178 | m_log.DebugFormat("[AUTHENTICATION DB]: Set authentication info for principalID {0}", info.PrincipalID); |
179 | return true; | 179 | return true; |
180 | } | 180 | } |
181 | 181 | ||
182 | protected string GetToken(UUID principalID, int lifetime) | 182 | protected string GetToken(UUID principalID, int lifetime) |
183 | { | 183 | { |
184 | UUID token = UUID.Random(); | 184 | UUID token = UUID.Random(); |
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index a9359f3..0204699 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Services.AuthenticationService | |||
41 | // Generic Authentication service used for identifying | 41 | // Generic Authentication service used for identifying |
42 | // and authenticating principals. | 42 | // and authenticating principals. |
43 | // Principals may be clients acting on users' behalf, | 43 | // Principals may be clients acting on users' behalf, |
44 | // or any other components that need | 44 | // or any other components that need |
45 | // verifiable identification. | 45 | // verifiable identification. |
46 | // | 46 | // |
47 | public class PasswordAuthenticationService : | 47 | public class PasswordAuthenticationService : |
@@ -50,7 +50,7 @@ namespace OpenSim.Services.AuthenticationService | |||
50 | private static readonly ILog m_log = | 50 | private static readonly ILog m_log = |
51 | LogManager.GetLogger( | 51 | LogManager.GetLogger( |
52 | MethodBase.GetCurrentMethod().DeclaringType); | 52 | MethodBase.GetCurrentMethod().DeclaringType); |
53 | 53 | ||
54 | public PasswordAuthenticationService(IConfigSource config, IUserAccountService userService) : | 54 | public PasswordAuthenticationService(IConfigSource config, IUserAccountService userService) : |
55 | base(config, userService) | 55 | base(config, userService) |
56 | { | 56 | { |
diff --git a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs index ef4e234..c946b04 100644 --- a/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.AuthenticationService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.AuthenticationService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs index 1510168..0bd5b1f 100644 --- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Services.AuthenticationService | |||
40 | // Generic Authentication service used for identifying | 40 | // Generic Authentication service used for identifying |
41 | // and authenticating principals. | 41 | // and authenticating principals. |
42 | // Principals may be clients acting on users' behalf, | 42 | // Principals may be clients acting on users' behalf, |
43 | // or any other components that need | 43 | // or any other components that need |
44 | // verifiable identification. | 44 | // verifiable identification. |
45 | // | 45 | // |
46 | public class WebkeyAuthenticationService : | 46 | public class WebkeyAuthenticationService : |
@@ -49,7 +49,7 @@ namespace OpenSim.Services.AuthenticationService | |||
49 | private static readonly ILog m_log = | 49 | private static readonly ILog m_log = |
50 | LogManager.GetLogger( | 50 | LogManager.GetLogger( |
51 | MethodBase.GetCurrentMethod().DeclaringType); | 51 | MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | public WebkeyAuthenticationService(IConfigSource config, IUserAccountService userService) : | 53 | public WebkeyAuthenticationService(IConfigSource config, IUserAccountService userService) : |
54 | base(config, userService) | 54 | base(config, userService) |
55 | { | 55 | { |
@@ -79,7 +79,7 @@ namespace OpenSim.Services.AuthenticationService | |||
79 | { | 79 | { |
80 | if (data.Data.ContainsKey("webLoginKey")) | 80 | if (data.Data.ContainsKey("webLoginKey")) |
81 | { | 81 | { |
82 | string key = data.Data["webLoginKey"].ToString(); | 82 | string key = data.Data["webLoginKey"].ToString(); |
83 | if (key == password) | 83 | if (key == password) |
84 | { | 84 | { |
85 | data.Data["webLoginKey"] = UUID.Zero.ToString(); | 85 | data.Data["webLoginKey"] = UUID.Zero.ToString(); |
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs index bbc8470..4203c7b 100644 --- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs | |||
@@ -43,9 +43,9 @@ namespace OpenSim.Services.AuthenticationService | |||
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private Dictionary<string, IAuthenticationService> m_svcChecks | 46 | private Dictionary<string, IAuthenticationService> m_svcChecks |
47 | = new Dictionary<string, IAuthenticationService>(); | 47 | = new Dictionary<string, IAuthenticationService>(); |
48 | 48 | ||
49 | public WebkeyOrPasswordAuthenticationService(IConfigSource config) | 49 | public WebkeyOrPasswordAuthenticationService(IConfigSource config) |
50 | : base(config) | 50 | : base(config) |
51 | { | 51 | { |
@@ -86,7 +86,7 @@ namespace OpenSim.Services.AuthenticationService | |||
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | 89 | ||
90 | 90 | ||
91 | if (result == string.Empty) | 91 | if (result == string.Empty) |
92 | { | 92 | { |
@@ -97,8 +97,8 @@ namespace OpenSim.Services.AuthenticationService | |||
97 | { | 97 | { |
98 | m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID); | 98 | m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID); |
99 | } | 99 | } |
100 | 100 | ||
101 | 101 | ||
102 | return result; | 102 | return result; |
103 | } | 103 | } |
104 | } | 104 | } |
diff --git a/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs b/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs index 75b1284..f87095a 100644 --- a/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.AuthorizationService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.AuthorizationService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/AvatarService/AvatarService.cs b/OpenSim/Services/AvatarService/AvatarService.cs index 423c781..222944c 100644 --- a/OpenSim/Services/AvatarService/AvatarService.cs +++ b/OpenSim/Services/AvatarService/AvatarService.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Services.AvatarService | |||
56 | AvatarData avatar = GetAvatar(principalID); | 56 | AvatarData avatar = GetAvatar(principalID); |
57 | return avatar.ToAvatarAppearance(); | 57 | return avatar.ToAvatarAppearance(); |
58 | } | 58 | } |
59 | 59 | ||
60 | public bool SetAppearance(UUID principalID, AvatarAppearance appearance) | 60 | public bool SetAppearance(UUID principalID, AvatarAppearance appearance) |
61 | { | 61 | { |
62 | AvatarData avatar = new AvatarData(appearance); | 62 | AvatarData avatar = new AvatarData(appearance); |
@@ -136,7 +136,7 @@ namespace OpenSim.Services.AvatarService | |||
136 | { | 136 | { |
137 | av.Data["Value"] = kvp.Value; | 137 | av.Data["Value"] = kvp.Value; |
138 | } | 138 | } |
139 | 139 | ||
140 | if (!m_Database.Store(av)) | 140 | if (!m_Database.Store(av)) |
141 | { | 141 | { |
142 | m_Database.Delete("PrincipalID", principalID.ToString()); | 142 | m_Database.Delete("PrincipalID", principalID.ToString()); |
diff --git a/OpenSim/Services/AvatarService/AvatarServiceBase.cs b/OpenSim/Services/AvatarService/AvatarServiceBase.cs index ab9d7cd..c1c4fb7 100644 --- a/OpenSim/Services/AvatarService/AvatarServiceBase.cs +++ b/OpenSim/Services/AvatarService/AvatarServiceBase.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Services.AvatarService | |||
68 | connString = presenceConfig.GetString("ConnectionString", connString); | 68 | connString = presenceConfig.GetString("ConnectionString", connString); |
69 | realm = presenceConfig.GetString("Realm", realm); | 69 | realm = presenceConfig.GetString("Realm", realm); |
70 | } | 70 | } |
71 | 71 | ||
72 | // | 72 | // |
73 | // We tried, but this doesn't exist. We can't proceed. | 73 | // We tried, but this doesn't exist. We can't proceed. |
74 | // | 74 | // |
diff --git a/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs b/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs index d64e53f..816ab0b 100644 --- a/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.AvatarService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.AvatarService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/Base/Properties/AssemblyInfo.cs b/OpenSim/Services/Base/Properties/AssemblyInfo.cs index 4090ef9..90c14d7 100644 --- a/OpenSim/Services/Base/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/Base/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.Base")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.Base")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs index 209a57a..2017f50 100644 --- a/OpenSim/Services/Base/ServiceBase.cs +++ b/OpenSim/Services/Base/ServiceBase.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Services.Base | |||
38 | public class ServiceBase | 38 | public class ServiceBase |
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
42 | public T LoadPlugin<T>(string dllName) where T:class | 42 | public T LoadPlugin<T>(string dllName) where T:class |
43 | { | 43 | { |
44 | return LoadPlugin<T>(dllName, new Object[0]); | 44 | return LoadPlugin<T>(dllName, new Object[0]); |
@@ -105,12 +105,12 @@ namespace OpenSim.Services.Base | |||
105 | List<string> strArgs = new List<string>(); | 105 | List<string> strArgs = new List<string>(); |
106 | foreach (Object arg in args) | 106 | foreach (Object arg in args) |
107 | strArgs.Add(arg.ToString()); | 107 | strArgs.Add(arg.ToString()); |
108 | 108 | ||
109 | m_log.Error( | 109 | m_log.Error( |
110 | string.Format( | 110 | string.Format( |
111 | "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}", | 111 | "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}", |
112 | interfaceName, dllName, string.Join(", ", strArgs.ToArray())), e); | 112 | interfaceName, dllName, string.Join(", ", strArgs.ToArray())), e); |
113 | 113 | ||
114 | return null; | 114 | return null; |
115 | } | 115 | } |
116 | } | 116 | } |
diff --git a/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs index 0e72c8b..bd342fa 100644 --- a/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs +++ b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Services.Connectors | |||
110 | { | 110 | { |
111 | m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: Exception when contacting agent preferences server at {0}: {1}", uri, e.Message); | 111 | m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: Exception when contacting agent preferences server at {0}: {1}", uri, e.Message); |
112 | } | 112 | } |
113 | 113 | ||
114 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 114 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |
115 | if (replyData != null) | 115 | if (replyData != null) |
116 | { | 116 | { |
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index bdc3bef..3fa8b54 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors | |||
55 | private List<AssetBase>[] m_sendRetries = new List<AssetBase>[MAXSENDRETRIESLEN]; | 55 | private List<AssetBase>[] m_sendRetries = new List<AssetBase>[MAXSENDRETRIESLEN]; |
56 | private System.Timers.Timer m_retryTimer; | 56 | private System.Timers.Timer m_retryTimer; |
57 | private int m_maxAssetRequestConcurrency = 30; | 57 | private int m_maxAssetRequestConcurrency = 30; |
58 | 58 | ||
59 | private delegate void AssetRetrievedEx(AssetBase asset); | 59 | private delegate void AssetRetrievedEx(AssetBase asset); |
60 | 60 | ||
61 | // Keeps track of concurrent requests for the same asset, so that it's only loaded once. | 61 | // Keeps track of concurrent requests for the same asset, so that it's only loaded once. |
@@ -150,7 +150,7 @@ namespace OpenSim.Services.Connectors | |||
150 | string prefix = id.Substring(0, 2).ToLower(); | 150 | string prefix = id.Substring(0, 2).ToLower(); |
151 | 151 | ||
152 | string host; | 152 | string host; |
153 | 153 | ||
154 | // HG URLs will not be valid UUIDS | 154 | // HG URLs will not be valid UUIDS |
155 | if (m_UriMap.ContainsKey(prefix)) | 155 | if (m_UriMap.ContainsKey(prefix)) |
156 | host = m_UriMap[prefix]; | 156 | host = m_UriMap[prefix]; |
@@ -180,11 +180,11 @@ namespace OpenSim.Services.Connectors | |||
180 | if(m_retryCounter >= 61 ) // avoid overflow 60 is max in use below | 180 | if(m_retryCounter >= 61 ) // avoid overflow 60 is max in use below |
181 | m_retryCounter = 1; | 181 | m_retryCounter = 1; |
182 | 182 | ||
183 | int inUse = 0; | 183 | int inUse = 0; |
184 | int nextlevel; | 184 | int nextlevel; |
185 | int timefactor; | 185 | int timefactor; |
186 | List<AssetBase> retrylist; | 186 | List<AssetBase> retrylist; |
187 | // we need to go down | 187 | // we need to go down |
188 | for(int i = MAXSENDRETRIESLEN - 1; i >= 0; i--) | 188 | for(int i = MAXSENDRETRIESLEN - 1; i >= 0; i--) |
189 | { | 189 | { |
190 | lock(m_sendRetries) | 190 | lock(m_sendRetries) |
@@ -219,13 +219,13 @@ namespace OpenSim.Services.Connectors | |||
219 | lock(m_sendRetries) | 219 | lock(m_sendRetries) |
220 | m_sendRetries[i] = null; | 220 | m_sendRetries[i] = null; |
221 | 221 | ||
222 | // we are the only ones with a copy of this retrylist now | 222 | // we are the only ones with a copy of this retrylist now |
223 | foreach(AssetBase ass in retrylist) | 223 | foreach(AssetBase ass in retrylist) |
224 | retryStore(ass, nextlevel); | 224 | retryStore(ass, nextlevel); |
225 | } | 225 | } |
226 | 226 | ||
227 | lock(m_sendRetries) | 227 | lock(m_sendRetries) |
228 | { | 228 | { |
229 | if(inUse == 0 ) | 229 | if(inUse == 0 ) |
230 | m_retryTimer.Stop(); | 230 | m_retryTimer.Stop(); |
231 | 231 | ||
@@ -245,7 +245,7 @@ namespace OpenSim.Services.Connectors | |||
245 | AssetBase asset = null; | 245 | AssetBase asset = null; |
246 | if (m_Cache != null) | 246 | if (m_Cache != null) |
247 | asset = m_Cache.Get(id); | 247 | asset = m_Cache.Get(id); |
248 | 248 | ||
249 | if (asset == null || asset.Data == null || asset.Data.Length == 0) | 249 | if (asset == null || asset.Data == null || asset.Data.Length == 0) |
250 | { | 250 | { |
251 | // XXX: Commented out for now since this has either never been properly operational or not for some time | 251 | // XXX: Commented out for now since this has either never been properly operational or not for some time |
@@ -259,7 +259,7 @@ namespace OpenSim.Services.Connectors | |||
259 | 259 | ||
260 | asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth); | 260 | asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth); |
261 | 261 | ||
262 | 262 | ||
263 | if (m_Cache != null) | 263 | if (m_Cache != null) |
264 | { | 264 | { |
265 | if (asset != null) | 265 | if (asset != null) |
@@ -438,7 +438,7 @@ namespace OpenSim.Services.Connectors | |||
438 | // This is most likely to happen because the server doesn't support this function, | 438 | // This is most likely to happen because the server doesn't support this function, |
439 | // so just silently return "doesn't exist" for all the assets. | 439 | // so just silently return "doesn't exist" for all the assets. |
440 | } | 440 | } |
441 | 441 | ||
442 | if (exist == null) | 442 | if (exist == null) |
443 | exist = new bool[ids.Length]; | 443 | exist = new bool[ids.Length]; |
444 | 444 | ||
@@ -557,7 +557,7 @@ namespace OpenSim.Services.Connectors | |||
557 | if(nextRetryLevel >= MAXSENDRETRIESLEN) | 557 | if(nextRetryLevel >= MAXSENDRETRIESLEN) |
558 | m_log.WarnFormat("[Assets] Upload giveup after several retries id: {0} type {1}", | 558 | m_log.WarnFormat("[Assets] Upload giveup after several retries id: {0} type {1}", |
559 | asset.ID.ToString(), asset.Type.ToString()); | 559 | asset.ID.ToString(), asset.Type.ToString()); |
560 | else | 560 | else |
561 | { | 561 | { |
562 | lock(m_sendRetries) | 562 | lock(m_sendRetries) |
563 | { | 563 | { |
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs index d2da85f..a130f71 100644 --- a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs +++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs | |||
@@ -37,7 +37,7 @@ using OpenMetaverse; | |||
37 | 37 | ||
38 | namespace OpenSim.Services.Connectors | 38 | namespace OpenSim.Services.Connectors |
39 | { | 39 | { |
40 | public class AuthorizationServicesConnector | 40 | public class AuthorizationServicesConnector |
41 | { | 41 | { |
42 | private static readonly ILog m_log = | 42 | private static readonly ILog m_log = |
43 | LogManager.GetLogger( | 43 | LogManager.GetLogger( |
@@ -45,7 +45,7 @@ namespace OpenSim.Services.Connectors | |||
45 | 45 | ||
46 | private string m_ServerURI = String.Empty; | 46 | private string m_ServerURI = String.Empty; |
47 | private bool m_ResponseOnFailure = true; | 47 | private bool m_ResponseOnFailure = true; |
48 | 48 | ||
49 | public AuthorizationServicesConnector() | 49 | public AuthorizationServicesConnector() |
50 | { | 50 | { |
51 | } | 51 | } |
@@ -78,11 +78,11 @@ namespace OpenSim.Services.Connectors | |||
78 | throw new Exception("Authorization connector init error"); | 78 | throw new Exception("Authorization connector init error"); |
79 | } | 79 | } |
80 | m_ServerURI = serviceURI; | 80 | m_ServerURI = serviceURI; |
81 | 81 | ||
82 | // this dictates what happens if the remote service fails, if the service fails and the value is true | 82 | // this dictates what happens if the remote service fails, if the service fails and the value is true |
83 | // the user is authorized for the region. | 83 | // the user is authorized for the region. |
84 | bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); | 84 | bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); |
85 | 85 | ||
86 | m_ResponseOnFailure = responseOnFailure; | 86 | m_ResponseOnFailure = responseOnFailure; |
87 | m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized"); | 87 | m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized"); |
88 | } | 88 | } |
@@ -91,11 +91,11 @@ namespace OpenSim.Services.Connectors | |||
91 | { | 91 | { |
92 | // do a remote call to the authorization server specified in the AuthorizationServerURI | 92 | // do a remote call to the authorization server specified in the AuthorizationServerURI |
93 | m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} at remote server {1}", userID, m_ServerURI); | 93 | m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} at remote server {1}", userID, m_ServerURI); |
94 | 94 | ||
95 | string uri = m_ServerURI; | 95 | string uri = m_ServerURI; |
96 | 96 | ||
97 | AuthorizationRequest req = new AuthorizationRequest(userID, firstname, surname, email, regionName, regionID); | 97 | AuthorizationRequest req = new AuthorizationRequest(userID, firstname, surname, email, regionName, regionID); |
98 | 98 | ||
99 | AuthorizationResponse response; | 99 | AuthorizationResponse response; |
100 | try | 100 | try |
101 | { | 101 | { |
@@ -114,7 +114,7 @@ namespace OpenSim.Services.Connectors | |||
114 | } | 114 | } |
115 | m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message); | 115 | m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message); |
116 | message = response.Message; | 116 | message = response.Message; |
117 | 117 | ||
118 | return response.IsAuthorized; | 118 | return response.IsAuthorized; |
119 | } | 119 | } |
120 | 120 | ||
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs index 3f44efa..424e95a 100644 --- a/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs +++ b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs | |||
@@ -94,13 +94,13 @@ namespace OpenSim.Services.Connectors | |||
94 | AvatarData avatar = GetAvatar(userID); | 94 | AvatarData avatar = GetAvatar(userID); |
95 | return avatar.ToAvatarAppearance(); | 95 | return avatar.ToAvatarAppearance(); |
96 | } | 96 | } |
97 | 97 | ||
98 | public bool SetAppearance(UUID userID, AvatarAppearance appearance) | 98 | public bool SetAppearance(UUID userID, AvatarAppearance appearance) |
99 | { | 99 | { |
100 | AvatarData avatar = new AvatarData(appearance); | 100 | AvatarData avatar = new AvatarData(appearance); |
101 | return SetAvatar(userID,avatar); | 101 | return SetAvatar(userID,avatar); |
102 | } | 102 | } |
103 | 103 | ||
104 | public AvatarData GetAvatar(UUID userID) | 104 | public AvatarData GetAvatar(UUID userID) |
105 | { | 105 | { |
106 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 106 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs index b7702a8..873b554 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
86 | 86 | ||
87 | 87 | ||
88 | #region IFriendsService | 88 | #region IFriendsService |
89 | 89 | ||
90 | public FriendInfo[] GetFriends(UUID PrincipalID) | 90 | public FriendInfo[] GetFriends(UUID PrincipalID) |
91 | { | 91 | { |
92 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 92 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs index ceb2146..ded7806 100644 --- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs | |||
@@ -683,7 +683,7 @@ namespace OpenSim.Services.Connectors | |||
683 | 683 | ||
684 | return rinfos; | 684 | return rinfos; |
685 | } | 685 | } |
686 | 686 | ||
687 | public int GetRegionFlags(UUID scopeID, UUID regionID) | 687 | public int GetRegionFlags(UUID scopeID, UUID regionID) |
688 | { | 688 | { |
689 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 689 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
@@ -755,7 +755,7 @@ namespace OpenSim.Services.Connectors | |||
755 | if (reply != string.Empty) | 755 | if (reply != string.Empty) |
756 | { | 756 | { |
757 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 757 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |
758 | 758 | ||
759 | if ((replyData != null) && replyData.Count > 0) | 759 | if ((replyData != null) && replyData.Count > 0) |
760 | { | 760 | { |
761 | foreach (string key in replyData.Keys) | 761 | foreach (string key in replyData.Keys) |
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index eef492d..e814c45 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
168 | string filename = string.Empty; | 168 | string filename = string.Empty; |
169 | 169 | ||
170 | try | 170 | try |
171 | { | 171 | { |
172 | //m_log.Debug("JPEG: " + imageURL); | 172 | //m_log.Debug("JPEG: " + imageURL); |
173 | string name = regionID.ToString(); | 173 | string name = regionID.ToString(); |
174 | filename = Path.Combine(storagePath, name + ".jpg"); | 174 | filename = Path.Combine(storagePath, name + ".jpg"); |
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs index b5e6d69..91e1740 100644 --- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs | |||
@@ -33,7 +33,7 @@ using Nini.Config; | |||
33 | 33 | ||
34 | namespace OpenSim.Services.Connectors | 34 | namespace OpenSim.Services.Connectors |
35 | { | 35 | { |
36 | public class HeloServicesConnector | 36 | public class HeloServicesConnector |
37 | { | 37 | { |
38 | private static readonly ILog m_log = | 38 | private static readonly ILog m_log = |
39 | LogManager.GetLogger( | 39 | LogManager.GetLogger( |
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 1b45bcf..b261675 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
113 | return "homeagent/"; | 113 | return "homeagent/"; |
114 | } | 114 | } |
115 | 115 | ||
116 | // The Login service calls this interface with fromLogin=true | 116 | // The Login service calls this interface with fromLogin=true |
117 | // Sims call it with fromLogin=false | 117 | // Sims call it with fromLogin=false |
118 | // Either way, this is verified by the handler | 118 | // Either way, this is verified by the handler |
119 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason) | 119 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason) |
@@ -159,7 +159,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
159 | } | 159 | } |
160 | 160 | ||
161 | public void SetClientToken(UUID sessionID, string token) | 161 | public void SetClientToken(UUID sessionID, string token) |
162 | { | 162 | { |
163 | // no-op | 163 | // no-op |
164 | } | 164 | } |
165 | 165 | ||
@@ -416,7 +416,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
416 | 416 | ||
417 | XmlRpcRequest request = new XmlRpcRequest("get_online_friends", paramList); | 417 | XmlRpcRequest request = new XmlRpcRequest("get_online_friends", paramList); |
418 | // string reason = string.Empty; | 418 | // string reason = string.Empty; |
419 | 419 | ||
420 | // Send and get reply | 420 | // Send and get reply |
421 | List<UUID> online = new List<UUID>(); | 421 | List<UUID> online = new List<UUID>(); |
422 | XmlRpcResponse response = null; | 422 | XmlRpcResponse response = null; |
@@ -497,7 +497,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
497 | hash["userID"] = userID.ToString(); | 497 | hash["userID"] = userID.ToString(); |
498 | 498 | ||
499 | hash = CallServer("get_server_urls", hash); | 499 | hash = CallServer("get_server_urls", hash); |
500 | 500 | ||
501 | Dictionary<string, object> serverURLs = new Dictionary<string, object>(); | 501 | Dictionary<string, object> serverURLs = new Dictionary<string, object>(); |
502 | foreach (object key in hash.Keys) | 502 | foreach (object key in hash.Keys) |
503 | { | 503 | { |
@@ -516,7 +516,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
516 | Hashtable hash = new Hashtable(); | 516 | Hashtable hash = new Hashtable(); |
517 | hash["userID"] = userID.ToString(); | 517 | hash["userID"] = userID.ToString(); |
518 | 518 | ||
519 | hash = CallServer("locate_user", hash); | 519 | hash = CallServer("locate_user", hash); |
520 | 520 | ||
521 | string url = string.Empty; | 521 | string url = string.Empty; |
522 | 522 | ||
@@ -574,7 +574,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
574 | { | 574 | { |
575 | // We can not use m_ServerURL here anymore because it causes | 575 | // We can not use m_ServerURL here anymore because it causes |
576 | // the HTTP request to be built without a host name. This messes | 576 | // the HTTP request to be built without a host name. This messes |
577 | // with OSGrid's NGINX and can make OSGrid avatars unable to TP | 577 | // with OSGrid's NGINX and can make OSGrid avatars unable to TP |
578 | // to other grids running recent mono. | 578 | // to other grids running recent mono. |
579 | response = request.Send(m_ServerURLHost, 10000); | 579 | response = request.Send(m_ServerURLHost, 10000); |
580 | } | 580 | } |
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs index bd5841b..dcf25ad 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Services.Connectors | |||
63 | /// In this case, -1 is default timeout (100 seconds), not infinite. | 63 | /// In this case, -1 is default timeout (100 seconds), not infinite. |
64 | /// </remarks> | 64 | /// </remarks> |
65 | private int m_requestTimeoutSecs = -1; | 65 | private int m_requestTimeoutSecs = -1; |
66 | private string m_configName = "InventoryService"; | 66 | private string m_configName = "InventoryService"; |
67 | 67 | ||
68 | private const double CACHE_EXPIRATION_SECONDS = 20.0; | 68 | private const double CACHE_EXPIRATION_SECONDS = 20.0; |
69 | private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>(); | 69 | private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>(); |
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors | |||
80 | public XInventoryServicesConnector(IConfigSource source, string configName) | 80 | public XInventoryServicesConnector(IConfigSource source, string configName) |
81 | : base(source, configName) | 81 | : base(source, configName) |
82 | { | 82 | { |
83 | m_configName = configName; | 83 | m_configName = configName; |
84 | Initialise(source); | 84 | Initialise(source); |
85 | } | 85 | } |
86 | 86 | ||
@@ -114,13 +114,13 @@ namespace OpenSim.Services.Connectors | |||
114 | 114 | ||
115 | StatsManager.RegisterStat( | 115 | StatsManager.RegisterStat( |
116 | new Stat( | 116 | new Stat( |
117 | "RequestsMade", | 117 | "RequestsMade", |
118 | "Requests made", | 118 | "Requests made", |
119 | "Number of requests made to the remove inventory service", | 119 | "Number of requests made to the remove inventory service", |
120 | "requests", | 120 | "requests", |
121 | "inventory", | 121 | "inventory", |
122 | serviceURI, | 122 | serviceURI, |
123 | StatType.Pull, | 123 | StatType.Pull, |
124 | MeasuresOfInterest.AverageChangeOverTime, | 124 | MeasuresOfInterest.AverageChangeOverTime, |
125 | s => s.Value = RequestsMade, | 125 | s => s.Value = RequestsMade, |
126 | StatVerbosity.Debug)); | 126 | StatVerbosity.Debug)); |
@@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors | |||
251 | 251 | ||
252 | return inventory; | 252 | return inventory; |
253 | } | 253 | } |
254 | 254 | ||
255 | public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs) | 255 | public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs) |
256 | { | 256 | { |
257 | InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length]; | 257 | InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length]; |
@@ -674,7 +674,7 @@ namespace OpenSim.Services.Connectors | |||
674 | { "ASSET", assetID.ToString() } | 674 | { "ASSET", assetID.ToString() } |
675 | }); | 675 | }); |
676 | 676 | ||
677 | // We cannot use CheckReturn() here because valid values for RESULT are "false" (in the case of request failure) or an int | 677 | // We cannot use CheckReturn() here because valid values for RESULT are "false" (in the case of request failure) or an int |
678 | if (ret == null) | 678 | if (ret == null) |
679 | return 0; | 679 | return 0; |
680 | 680 | ||
@@ -719,7 +719,7 @@ namespace OpenSim.Services.Connectors | |||
719 | reply = SynchronousRestFormsRequester.MakeRequest( | 719 | reply = SynchronousRestFormsRequester.MakeRequest( |
720 | "POST", m_ServerURI + "/xinventory", | 720 | "POST", m_ServerURI + "/xinventory", |
721 | ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth); | 721 | ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth); |
722 | 722 | ||
723 | if (reply != String.Empty) | 723 | if (reply != String.Empty) |
724 | break; | 724 | break; |
725 | 725 | ||
diff --git a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs index 5e9331e..047880a 100644 --- a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs | |||
@@ -122,12 +122,12 @@ namespace OpenSim.Services.Connectors | |||
122 | catch (Exception e) | 122 | catch (Exception e) |
123 | { | 123 | { |
124 | m_log.ErrorFormat( | 124 | m_log.ErrorFormat( |
125 | "[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}", | 125 | "[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}", |
126 | e.Message, e.StackTrace); | 126 | e.Message, e.StackTrace); |
127 | } | 127 | } |
128 | } | 128 | } |
129 | } | 129 | } |
130 | else | 130 | else |
131 | m_log.WarnFormat("[LAND CONNECTOR]: Couldn't find region with handle {0}", regionHandle); | 131 | m_log.WarnFormat("[LAND CONNECTOR]: Couldn't find region with handle {0}", regionHandle); |
132 | } | 132 | } |
133 | catch (Exception e) | 133 | catch (Exception e) |
@@ -135,7 +135,7 @@ namespace OpenSim.Services.Connectors | |||
135 | m_log.ErrorFormat( | 135 | m_log.ErrorFormat( |
136 | "[LAND CONNECTOR]: Couldn't contact region {0}: {1} {2}", regionHandle, e.Message, e.StackTrace); | 136 | "[LAND CONNECTOR]: Couldn't contact region {0}: {1} {2}", regionHandle, e.Message, e.StackTrace); |
137 | } | 137 | } |
138 | 138 | ||
139 | return landData; | 139 | return landData; |
140 | } | 140 | } |
141 | } | 141 | } |
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs index 1f14b32..89d64ca 100644 --- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs +++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Services.Connectors | |||
107 | { | 107 | { |
108 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", | 108 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", |
109 | uri, | 109 | uri, |
110 | reqString, | 110 | reqString, |
111 | m_Auth); | 111 | m_Auth); |
112 | if (reply != string.Empty) | 112 | if (reply != string.Empty) |
113 | { | 113 | { |
@@ -315,8 +315,8 @@ namespace OpenSim.Services.Connectors | |||
315 | } | 315 | } |
316 | else | 316 | else |
317 | { | 317 | { |
318 | if (replyData["result"].ToString() == "null") | 318 | if (replyData["result"].ToString() == "null") |
319 | return null; | 319 | return null; |
320 | 320 | ||
321 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString()); | 321 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString()); |
322 | } | 322 | } |
@@ -366,7 +366,7 @@ namespace OpenSim.Services.Connectors | |||
366 | 366 | ||
367 | if (replyData != null) | 367 | if (replyData != null) |
368 | { | 368 | { |
369 | if (replyData.ContainsKey("result") && | 369 | if (replyData.ContainsKey("result") && |
370 | (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure")) | 370 | (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure")) |
371 | { | 371 | { |
372 | return new PresenceInfo[0]; | 372 | return new PresenceInfo[0]; |
diff --git a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs index 3c5ca7d..76d26d6 100644 --- a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.Connectors")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.Connectors")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 531939f..121e863 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
77 | public string Name { get { return "SimianAssetServiceConnector"; } } | 77 | public string Name { get { return "SimianAssetServiceConnector"; } } |
78 | public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IAssetService>(this); } } | 78 | public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IAssetService>(this); } } |
79 | public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IAssetService>(this); } } | 79 | public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IAssetService>(this); } } |
80 | 80 | ||
81 | #endregion ISharedRegionModule | 81 | #endregion ISharedRegionModule |
82 | 82 | ||
83 | public SimianAssetServiceConnector(IConfigSource source) | 83 | public SimianAssetServiceConnector(IConfigSource source) |
@@ -143,7 +143,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
143 | 143 | ||
144 | return SimianGetOperation(id); | 144 | return SimianGetOperation(id); |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||
148 | public AssetBase GetCached(string id) | 148 | public AssetBase GetCached(string id) |
149 | { | 149 | { |
@@ -177,7 +177,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
177 | // return GetRemoteMetadata(id); | 177 | // return GetRemoteMetadata(id); |
178 | return SimianGetMetadataOperation(id); | 178 | return SimianGetMetadataOperation(id); |
179 | } | 179 | } |
180 | 180 | ||
181 | public byte[] GetData(string id) | 181 | public byte[] GetData(string id) |
182 | { | 182 | { |
183 | if (String.IsNullOrEmpty(m_serverUrl)) | 183 | if (String.IsNullOrEmpty(m_serverUrl)) |
@@ -296,7 +296,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
296 | 296 | ||
297 | return SimianStoreOperation(asset); | 297 | return SimianStoreOperation(asset); |
298 | } | 298 | } |
299 | 299 | ||
300 | /// <summary> | 300 | /// <summary> |
301 | /// Update an asset's content | 301 | /// Update an asset's content |
302 | /// </summary> | 302 | /// </summary> |
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
344 | 344 | ||
345 | return SimianDeleteOperation(id); | 345 | return SimianDeleteOperation(id); |
346 | } | 346 | } |
347 | 347 | ||
348 | #endregion IAssetService | 348 | #endregion IAssetService |
349 | 349 | ||
350 | #region SimianOperations | 350 | #region SimianOperations |
@@ -369,9 +369,9 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
369 | m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset; {0}",response["Message"].AsString()); | 369 | m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset; {0}",response["Message"].AsString()); |
370 | return false; | 370 | return false; |
371 | } | 371 | } |
372 | 372 | ||
373 | return true; | 373 | return true; |
374 | 374 | ||
375 | } | 375 | } |
376 | catch (Exception ex) | 376 | catch (Exception ex) |
377 | { | 377 | { |
@@ -400,7 +400,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
400 | { "Temporary", asset.Temporary ? "1" : "0" }, | 400 | { "Temporary", asset.Temporary ? "1" : "0" }, |
401 | { "Name", asset.Name } | 401 | { "Name", asset.Name } |
402 | }; | 402 | }; |
403 | 403 | ||
404 | OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); | 404 | OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); |
405 | if (! response["Success"].AsBoolean()) | 405 | if (! response["Success"].AsBoolean()) |
406 | { | 406 | { |
@@ -410,13 +410,13 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
410 | 410 | ||
411 | // asset.ID is always set before calling this function | 411 | // asset.ID is always set before calling this function |
412 | return asset.ID; | 412 | return asset.ID; |
413 | 413 | ||
414 | } | 414 | } |
415 | catch (Exception ex) | 415 | catch (Exception ex) |
416 | { | 416 | { |
417 | m_log.ErrorFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",ex.Message); | 417 | m_log.ErrorFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",ex.Message); |
418 | } | 418 | } |
419 | 419 | ||
420 | return null; | 420 | return null; |
421 | } | 421 | } |
422 | 422 | ||
@@ -427,12 +427,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
427 | /// <returns></returns> | 427 | /// <returns></returns> |
428 | private AssetBase SimianGetOperation(string id) | 428 | private AssetBase SimianGetOperation(string id) |
429 | { | 429 | { |
430 | try | 430 | try |
431 | { | 431 | { |
432 | NameValueCollection requestArgs = new NameValueCollection | 432 | NameValueCollection requestArgs = new NameValueCollection |
433 | { | 433 | { |
434 | { "RequestMethod", "xGetAsset" }, | 434 | { "RequestMethod", "xGetAsset" }, |
435 | { "ID", id } | 435 | { "ID", id } |
436 | }; | 436 | }; |
437 | 437 | ||
438 | OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); | 438 | OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); |
@@ -441,7 +441,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
441 | m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset; {0}",response["Message"].AsString()); | 441 | m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset; {0}",response["Message"].AsString()); |
442 | return null; | 442 | return null; |
443 | } | 443 | } |
444 | 444 | ||
445 | AssetBase asset = new AssetBase(); | 445 | AssetBase asset = new AssetBase(); |
446 | 446 | ||
447 | asset.ID = id; | 447 | asset.ID = id; |
@@ -475,7 +475,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
475 | NameValueCollection requestArgs = new NameValueCollection | 475 | NameValueCollection requestArgs = new NameValueCollection |
476 | { | 476 | { |
477 | { "RequestMethod", "xGetAssetMetadata" }, | 477 | { "RequestMethod", "xGetAssetMetadata" }, |
478 | { "ID", id } | 478 | { "ID", id } |
479 | }; | 479 | }; |
480 | 480 | ||
481 | OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); | 481 | OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); |
@@ -485,7 +485,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
485 | // m_log.DebugFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset metadata; {0}",response["Message"].AsString()); | 485 | // m_log.DebugFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset metadata; {0}",response["Message"].AsString()); |
486 | return null; | 486 | return null; |
487 | } | 487 | } |
488 | 488 | ||
489 | AssetMetadata metadata = new AssetMetadata(); | 489 | AssetMetadata metadata = new AssetMetadata(); |
490 | metadata.ID = id; | 490 | metadata.ID = id; |
491 | metadata.ContentType = response["ContentType"].AsString(); | 491 | metadata.ContentType = response["ContentType"].AsString(); |
@@ -620,7 +620,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
620 | // } | 620 | // } |
621 | 621 | ||
622 | // string errorMessage = null; | 622 | // string errorMessage = null; |
623 | 623 | ||
624 | // // Build the remote storage request | 624 | // // Build the remote storage request |
625 | // List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>() | 625 | // List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>() |
626 | // { | 626 | // { |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs index a52dd6c..34bb274 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | |||
@@ -146,7 +146,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
146 | userID,response["Message"].AsString()); | 146 | userID,response["Message"].AsString()); |
147 | return null; | 147 | return null; |
148 | } | 148 | } |
149 | 149 | ||
150 | // <summary> | 150 | // <summary> |
151 | // </summary> | 151 | // </summary> |
152 | // <param name=""></param> | 152 | // <param name=""></param> |
@@ -178,7 +178,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
178 | 178 | ||
179 | return success; | 179 | return success; |
180 | } | 180 | } |
181 | 181 | ||
182 | // <summary> | 182 | // <summary> |
183 | // </summary> | 183 | // </summary> |
184 | // <param name=""></param> | 184 | // <param name=""></param> |
@@ -219,7 +219,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
219 | appearance.AvatarHeight = (float)map["Height"].AsReal(); | 219 | appearance.AvatarHeight = (float)map["Height"].AsReal(); |
220 | 220 | ||
221 | AvatarData avatar = new AvatarData(appearance); | 221 | AvatarData avatar = new AvatarData(appearance); |
222 | 222 | ||
223 | // Get attachments | 223 | // Get attachments |
224 | map = null; | 224 | map = null; |
225 | try { map = OSDParser.DeserializeJson(response["LLAttachments"].AsString()) as OSDMap; } | 225 | try { map = OSDParser.DeserializeJson(response["LLAttachments"].AsString()) as OSDMap; } |
@@ -230,7 +230,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
230 | foreach (KeyValuePair<string, OSD> kvp in map) | 230 | foreach (KeyValuePair<string, OSD> kvp in map) |
231 | avatar.Data[kvp.Key] = kvp.Value.AsString(); | 231 | avatar.Data[kvp.Key] = kvp.Value.AsString(); |
232 | } | 232 | } |
233 | 233 | ||
234 | return avatar; | 234 | return avatar; |
235 | } | 235 | } |
236 | else | 236 | else |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs index 764e71f..49bd9a4 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
55 | private bool m_enabled = true; | 55 | private bool m_enabled = true; |
56 | private Scene m_scene; | 56 | private Scene m_scene; |
57 | private String m_simianURL; | 57 | private String m_simianURL; |
58 | 58 | ||
59 | #region IRegionModule Members | 59 | #region IRegionModule Members |
60 | 60 | ||
61 | public string Name | 61 | public string Name |
@@ -65,10 +65,10 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
65 | 65 | ||
66 | public void Initialise(IConfigSource config) | 66 | public void Initialise(IConfigSource config) |
67 | { | 67 | { |
68 | try | 68 | try |
69 | { | 69 | { |
70 | IConfig m_config; | 70 | IConfig m_config; |
71 | 71 | ||
72 | if ((m_config = config.Configs["SimianExternalCaps"]) != null) | 72 | if ((m_config = config.Configs["SimianExternalCaps"]) != null) |
73 | { | 73 | { |
74 | m_enabled = m_config.GetBoolean("Enabled", m_enabled); | 74 | m_enabled = m_config.GetBoolean("Enabled", m_enabled); |
@@ -97,10 +97,10 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
97 | public void Close() { } | 97 | public void Close() { } |
98 | 98 | ||
99 | public void AddRegion(Scene scene) | 99 | public void AddRegion(Scene scene) |
100 | { | 100 | { |
101 | if (! m_enabled) | 101 | if (! m_enabled) |
102 | return; | 102 | return; |
103 | 103 | ||
104 | m_scene = scene; | 104 | m_scene = scene; |
105 | m_scene.RegisterModuleInterface<IExternalCapsModule>(this); | 105 | m_scene.RegisterModuleInterface<IExternalCapsModule>(this); |
106 | } | 106 | } |
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
153 | subs["%USR%"] = agentID.ToString(); | 153 | subs["%USR%"] = agentID.ToString(); |
154 | subs["%CAP%"] = cap.ToString(); | 154 | subs["%CAP%"] = cap.ToString(); |
155 | subs["%SIM%"] = m_scene.RegionInfo.RegionID.ToString(); | 155 | subs["%SIM%"] = m_scene.RegionInfo.RegionID.ToString(); |
156 | 156 | ||
157 | caps.RegisterHandler(capName,ExpandSkeletonURL(urlSkel,subs)); | 157 | caps.RegisterHandler(capName,ExpandSkeletonURL(urlSkel,subs)); |
158 | return true; | 158 | return true; |
159 | } | 159 | } |
@@ -168,12 +168,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
168 | private String ExpandSkeletonURL(String urlSkel, Dictionary<String,String> subs) | 168 | private String ExpandSkeletonURL(String urlSkel, Dictionary<String,String> subs) |
169 | { | 169 | { |
170 | String result = urlSkel; | 170 | String result = urlSkel; |
171 | 171 | ||
172 | foreach (KeyValuePair<String,String> kvp in subs) | 172 | foreach (KeyValuePair<String,String> kvp in subs) |
173 | { | 173 | { |
174 | result = result.Replace(kvp.Key,kvp.Value); | 174 | result = result.Replace(kvp.Key,kvp.Value); |
175 | } | 175 | } |
176 | 176 | ||
177 | return result; | 177 | return result; |
178 | } | 178 | } |
179 | } | 179 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs index a35d749..b29adb3 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | |||
@@ -52,20 +52,20 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
52 | private IConfig m_config = null; | 52 | private IConfig m_config = null; |
53 | 53 | ||
54 | private String m_simianURL; | 54 | private String m_simianURL; |
55 | 55 | ||
56 | #region IRegionModule Members | 56 | #region IRegionModule Members |
57 | 57 | ||
58 | public string Name | 58 | public string Name |
59 | { | 59 | { |
60 | get { return this.GetType().Name; } | 60 | get { return this.GetType().Name; } |
61 | } | 61 | } |
62 | 62 | ||
63 | public void Initialise(IConfigSource config) | 63 | public void Initialise(IConfigSource config) |
64 | { | 64 | { |
65 | try | 65 | try |
66 | { | 66 | { |
67 | m_config = config.Configs["SimianGrid"]; | 67 | m_config = config.Configs["SimianGrid"]; |
68 | 68 | ||
69 | if (m_config != null) | 69 | if (m_config != null) |
70 | { | 70 | { |
71 | m_simianURL = m_config.GetString("SimianServiceURL"); | 71 | m_simianURL = m_config.GetString("SimianServiceURL"); |
@@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
74 | // m_log.DebugFormat("[SimianGrid] service URL is not defined"); | 74 | // m_log.DebugFormat("[SimianGrid] service URL is not defined"); |
75 | return; | 75 | return; |
76 | } | 76 | } |
77 | 77 | ||
78 | InitialiseSimCap(); | 78 | InitialiseSimCap(); |
79 | SimulatorCapability = SimulatorCapability.Trim(); | 79 | SimulatorCapability = SimulatorCapability.Trim(); |
80 | m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability); | 80 | m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability); |
@@ -100,7 +100,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
100 | 100 | ||
101 | ///<summary> | 101 | ///<summary> |
102 | /// Try a variety of methods for finding the simian simulator capability; first check the | 102 | /// Try a variety of methods for finding the simian simulator capability; first check the |
103 | /// configuration itself, then look for a file that contains the cap, then finally look | 103 | /// configuration itself, then look for a file that contains the cap, then finally look |
104 | /// for an environment variable that contains it. | 104 | /// for an environment variable that contains it. |
105 | ///</summary> | 105 | ///</summary> |
106 | private void InitialiseSimCap() | 106 | private void InitialiseSimCap() |
@@ -110,7 +110,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
110 | SimulatorCapability = m_config.GetString("SimulatorCapability"); | 110 | SimulatorCapability = m_config.GetString("SimulatorCapability"); |
111 | return; | 111 | return; |
112 | } | 112 | } |
113 | 113 | ||
114 | if (m_config.Contains("SimulatorCapabilityFile")) | 114 | if (m_config.Contains("SimulatorCapabilityFile")) |
115 | { | 115 | { |
116 | String filename = m_config.GetString("SimulatorCapabilityFile"); | 116 | String filename = m_config.GetString("SimulatorCapabilityFile"); |
@@ -120,7 +120,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
120 | return; | 120 | return; |
121 | } | 121 | } |
122 | } | 122 | } |
123 | 123 | ||
124 | if (m_config.Contains("SimulatorCapabilityVariable")) | 124 | if (m_config.Contains("SimulatorCapabilityVariable")) |
125 | { | 125 | { |
126 | String envname = m_config.GetString("SimulatorCapabilityVariable"); | 126 | String envname = m_config.GetString("SimulatorCapabilityVariable"); |
@@ -134,7 +134,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
134 | 134 | ||
135 | m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability"); | 135 | m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability"); |
136 | } | 136 | } |
137 | 137 | ||
138 | #endregion | 138 | #endregion |
139 | 139 | ||
140 | public static String SimulatorCapability = UUID.Zero.ToString(); | 140 | public static String SimulatorCapability = UUID.Zero.ToString(); |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs index 8375c95..4896d09 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs | |||
@@ -65,14 +65,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
65 | private int m_refreshtime = 0; | 65 | private int m_refreshtime = 0; |
66 | private int m_lastrefresh = 0; | 66 | private int m_lastrefresh = 0; |
67 | private System.Timers.Timer m_refreshTimer = new System.Timers.Timer(); | 67 | private System.Timers.Timer m_refreshTimer = new System.Timers.Timer(); |
68 | 68 | ||
69 | #region ISharedRegionModule | 69 | #region ISharedRegionModule |
70 | 70 | ||
71 | public Type ReplaceableInterface { get { return null; } } | 71 | public Type ReplaceableInterface { get { return null; } } |
72 | public string Name { get { return "SimianGridMaptile"; } } | 72 | public string Name { get { return "SimianGridMaptile"; } } |
73 | public void RegionLoaded(Scene scene) { } | 73 | public void RegionLoaded(Scene scene) { } |
74 | public void Close() { } | 74 | public void Close() { } |
75 | 75 | ||
76 | ///<summary> | 76 | ///<summary> |
77 | /// | 77 | /// |
78 | ///</summary> | 78 | ///</summary> |
@@ -81,7 +81,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
81 | IConfig config = source.Configs["SimianGridMaptiles"]; | 81 | IConfig config = source.Configs["SimianGridMaptiles"]; |
82 | if (config == null) | 82 | if (config == null) |
83 | return; | 83 | return; |
84 | 84 | ||
85 | if (! config.GetBoolean("Enabled", false)) | 85 | if (! config.GetBoolean("Enabled", false)) |
86 | return; | 86 | return; |
87 | 87 | ||
@@ -218,7 +218,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
218 | { | 218 | { |
219 | uint locX = scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize); | 219 | uint locX = scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize); |
220 | uint locY = scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize); | 220 | uint locY = scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize); |
221 | 221 | ||
222 | ConvertAndUploadMaptile(subMapTile, locX, locY); | 222 | ConvertAndUploadMaptile(subMapTile, locX, locY); |
223 | } | 223 | } |
224 | } | 224 | } |
@@ -232,7 +232,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
232 | } | 232 | } |
233 | 233 | ||
234 | } | 234 | } |
235 | 235 | ||
236 | ///<summary> | 236 | ///<summary> |
237 | /// | 237 | /// |
238 | ///</summary> | 238 | ///</summary> |
@@ -255,7 +255,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
255 | { "ContentType", "image/png" }, | 255 | { "ContentType", "image/png" }, |
256 | { "EncodedData", System.Convert.ToBase64String(pngData) } | 256 | { "EncodedData", System.Convert.ToBase64String(pngData) } |
257 | }; | 257 | }; |
258 | 258 | ||
259 | OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); | 259 | OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); |
260 | if (! response["Success"].AsBoolean()) | 260 | if (! response["Success"].AsBoolean()) |
261 | { | 261 | { |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index bd35c6f..f8eebbe 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -91,7 +91,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
91 | m_log.Error("[SIMIAN GRID CONNECTOR]: No Server URI named in section GridService"); | 91 | m_log.Error("[SIMIAN GRID CONNECTOR]: No Server URI named in section GridService"); |
92 | throw new Exception("Grid connector init error"); | 92 | throw new Exception("Grid connector init error"); |
93 | } | 93 | } |
94 | 94 | ||
95 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) | 95 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) |
96 | serviceUrl = serviceUrl + '/'; | 96 | serviceUrl = serviceUrl + '/'; |
97 | m_ServerURI = serviceUrl; | 97 | m_ServerURI = serviceUrl; |
@@ -230,7 +230,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
230 | }; | 230 | }; |
231 | 231 | ||
232 | // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request grid at {0}",position.ToString()); | 232 | // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request grid at {0}",position.ToString()); |
233 | 233 | ||
234 | OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs); | 234 | OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs); |
235 | if (response["Success"].AsBoolean()) | 235 | if (response["Success"].AsBoolean()) |
236 | { | 236 | { |
@@ -308,7 +308,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
308 | }; | 308 | }; |
309 | 309 | ||
310 | //m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions by range {0} to {1}",minPosition.ToString(),maxPosition.ToString()); | 310 | //m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions by range {0} to {1}",minPosition.ToString(),maxPosition.ToString()); |
311 | 311 | ||
312 | 312 | ||
313 | OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs); | 313 | OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs); |
314 | if (response["Success"].AsBoolean()) | 314 | if (response["Success"].AsBoolean()) |
@@ -413,7 +413,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
413 | return -1; | 413 | return -1; |
414 | } | 414 | } |
415 | } | 415 | } |
416 | 416 | ||
417 | public Dictionary<string, object> GetExtraFeatures() | 417 | public Dictionary<string, object> GetExtraFeatures() |
418 | { | 418 | { |
419 | /// See SimulatorFeaturesModule - Need to get map, search and destination guide | 419 | /// See SimulatorFeaturesModule - Need to get map, search and destination guide |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 3d35834..9eefd16 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -535,7 +535,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
535 | allSuccess = false; | 535 | allSuccess = false; |
536 | } | 536 | } |
537 | } | 537 | } |
538 | 538 | ||
539 | return allSuccess; | 539 | return allSuccess; |
540 | } | 540 | } |
541 | 541 | ||
@@ -727,11 +727,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
727 | 727 | ||
728 | /// <summary> | 728 | /// <summary> |
729 | /// Get the union of permissions of all inventory items | 729 | /// Get the union of permissions of all inventory items |
730 | /// that hold the given assetID. | 730 | /// that hold the given assetID. |
731 | /// </summary> | 731 | /// </summary> |
732 | /// <param name="userID"></param> | 732 | /// <param name="userID"></param> |
733 | /// <param name="assetID"></param> | 733 | /// <param name="assetID"></param> |
734 | /// <returns>The permissions or 0 if no such asset is found in | 734 | /// <returns>The permissions or 0 if no such asset is found in |
735 | /// the user's inventory</returns> | 735 | /// the user's inventory</returns> |
736 | public int GetAssetPermissions(UUID userID, UUID assetID) | 736 | public int GetAssetPermissions(UUID userID, UUID assetID) |
737 | { | 737 | { |
@@ -787,7 +787,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
787 | if (item != null && item["Type"].AsString() == "Item") | 787 | if (item != null && item["Type"].AsString() == "Item") |
788 | { | 788 | { |
789 | InventoryItemBase invItem = new InventoryItemBase(); | 789 | InventoryItemBase invItem = new InventoryItemBase(); |
790 | 790 | ||
791 | invItem.AssetID = item["AssetID"].AsUUID(); | 791 | invItem.AssetID = item["AssetID"].AsUUID(); |
792 | invItem.AssetType = SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString()); | 792 | invItem.AssetType = SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString()); |
793 | invItem.CreationDate = item["CreationDate"].AsInteger(); | 793 | invItem.CreationDate = item["CreationDate"].AsInteger(); |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index 211b775..08efefb 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |||
@@ -121,7 +121,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
121 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) | 121 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) |
122 | serviceUrl = serviceUrl + '/'; | 122 | serviceUrl = serviceUrl + '/'; |
123 | m_serverUrl = serviceUrl; | 123 | m_serverUrl = serviceUrl; |
124 | m_activityDetector = new SimianActivityDetector(this); | 124 | m_activityDetector = new SimianActivityDetector(this); |
125 | m_Enabled = true; | 125 | m_Enabled = true; |
126 | } | 126 | } |
127 | } | 127 | } |
@@ -210,7 +210,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
210 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session {0}: {1}",sessionID.ToString(),sessionResponse["Message"].AsString()); | 210 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session {0}: {1}",sessionID.ToString(),sessionResponse["Message"].AsString()); |
211 | return null; | 211 | return null; |
212 | } | 212 | } |
213 | 213 | ||
214 | UUID userID = sessionResponse["UserID"].AsUUID(); | 214 | UUID userID = sessionResponse["UserID"].AsUUID(); |
215 | OSDMap userResponse = GetUserData(userID); | 215 | OSDMap userResponse = GetUserData(userID); |
216 | if (userResponse == null) | 216 | if (userResponse == null) |
@@ -238,7 +238,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
238 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString()); | 238 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString()); |
239 | return null; | 239 | return null; |
240 | } | 240 | } |
241 | 241 | ||
242 | OSDArray sessionList = sessionListResponse["Sessions"] as OSDArray; | 242 | OSDArray sessionList = sessionListResponse["Sessions"] as OSDArray; |
243 | for (int i = 0; i < sessionList.Count; i++) | 243 | for (int i = 0; i < sessionList.Count; i++) |
244 | { | 244 | { |
@@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
311 | 311 | ||
312 | public GridUserInfo GetGridUserInfo(string user) | 312 | public GridUserInfo GetGridUserInfo(string user) |
313 | { | 313 | { |
314 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); | 314 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); |
315 | 315 | ||
316 | UUID userID = new UUID(user); | 316 | UUID userID = new UUID(user); |
317 | OSDMap userResponse = GetUserData(userID); | 317 | OSDMap userResponse = GetUserData(userID); |
@@ -421,7 +421,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
421 | 421 | ||
422 | return null; | 422 | return null; |
423 | } | 423 | } |
424 | 424 | ||
425 | private string SerializeLocation(UUID regionID, Vector3 position, Vector3 lookAt) | 425 | private string SerializeLocation(UUID regionID, Vector3 position, Vector3 lookAt) |
426 | { | 426 | { |
427 | return "{" + String.Format("\"SceneID\":\"{0}\",\"Position\":\"{1}\",\"LookAt\":\"{2}\"", regionID, position, lookAt) + "}"; | 427 | return "{" + String.Format("\"SceneID\":\"{0}\",\"Position\":\"{1}\",\"LookAt\":\"{2}\"", regionID, position, lookAt) + "}"; |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index 17f4fc6..a388bcc 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
70 | private bool m_Enabled = false; | 70 | private bool m_Enabled = false; |
71 | 71 | ||
72 | #region INonSharedRegionModule | 72 | #region INonSharedRegionModule |
73 | 73 | ||
74 | public Type ReplaceableInterface { get { return null; } } | 74 | public Type ReplaceableInterface { get { return null; } } |
75 | public void RegionLoaded(Scene scene) { } | 75 | public void RegionLoaded(Scene scene) { } |
76 | public void Close() { } | 76 | public void Close() { } |
@@ -284,7 +284,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
284 | private void RequestAvatarPropertiesHandler(IClientAPI client, UUID avatarID) | 284 | private void RequestAvatarPropertiesHandler(IClientAPI client, UUID avatarID) |
285 | { | 285 | { |
286 | m_log.DebugFormat("[SIMIAN PROFILES]: Request avatar properties for {0}",avatarID); | 286 | m_log.DebugFormat("[SIMIAN PROFILES]: Request avatar properties for {0}",avatarID); |
287 | 287 | ||
288 | OSDMap user = FetchUserData(avatarID); | 288 | OSDMap user = FetchUserData(avatarID); |
289 | 289 | ||
290 | ProfileFlags flags = ProfileFlags.AllowPublish | ProfileFlags.MaturePublish; | 290 | ProfileFlags flags = ProfileFlags.AllowPublish | ProfileFlags.MaturePublish; |
@@ -455,7 +455,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
455 | private OSDMap FetchUserData(UUID userID) | 455 | private OSDMap FetchUserData(UUID userID) |
456 | { | 456 | { |
457 | m_log.DebugFormat("[SIMIAN PROFILES]: Fetch information about {0}",userID); | 457 | m_log.DebugFormat("[SIMIAN PROFILES]: Fetch information about {0}",userID); |
458 | 458 | ||
459 | NameValueCollection requestArgs = new NameValueCollection | 459 | NameValueCollection requestArgs = new NameValueCollection |
460 | { | 460 | { |
461 | { "RequestMethod", "GetUser" }, | 461 | { "RequestMethod", "GetUser" }, |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 6f613c1..115ae36 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -42,7 +42,7 @@ using OpenMetaverse.StructuredData; | |||
42 | namespace OpenSim.Services.Connectors.SimianGrid | 42 | namespace OpenSim.Services.Connectors.SimianGrid |
43 | { | 43 | { |
44 | /// <summary> | 44 | /// <summary> |
45 | /// Connects user account data (creating new users, looking up existing | 45 | /// Connects user account data (creating new users, looking up existing |
46 | /// users) to the SimianGrid backend | 46 | /// users) to the SimianGrid backend |
47 | /// </summary> | 47 | /// </summary> |
48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianUserAccountServiceConnector")] | 48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianUserAccountServiceConnector")] |
@@ -220,7 +220,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
220 | }; | 220 | }; |
221 | 221 | ||
222 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); | 222 | OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); |
223 | 223 | ||
224 | if (response["Success"].AsBoolean()) | 224 | if (response["Success"].AsBoolean()) |
225 | { | 225 | { |
226 | m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account data for " + data.Name); | 226 | m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account data for " + data.Name); |
@@ -305,7 +305,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
305 | account.LocalToGrid = true; | 305 | account.LocalToGrid = true; |
306 | if (response.ContainsKey("LocalToGrid")) | 306 | if (response.ContainsKey("LocalToGrid")) |
307 | account.LocalToGrid = (response["LocalToGrid"].AsString() == "true" ? true : false); | 307 | account.LocalToGrid = (response["LocalToGrid"].AsString() == "true" ? true : false); |
308 | 308 | ||
309 | GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName); | 309 | GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName); |
310 | 310 | ||
311 | // Cache the user account info | 311 | // Cache the user account info |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 8e1bf37..9f4d89a 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
50 | 50 | ||
51 | // we use this dictionary to track the pending updateagent requests, maps URI --> position update | 51 | // we use this dictionary to track the pending updateagent requests, maps URI --> position update |
52 | private Dictionary<string,AgentPosition> m_updateAgentQueue = new Dictionary<string,AgentPosition>(); | 52 | private Dictionary<string,AgentPosition> m_updateAgentQueue = new Dictionary<string,AgentPosition>(); |
53 | 53 | ||
54 | //private GridRegion m_Region; | 54 | //private GridRegion m_Region; |
55 | 55 | ||
56 | public SimulationServiceConnector() | 56 | public SimulationServiceConnector() |
@@ -119,7 +119,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
119 | m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Creating agent at {0}", destination.ServerURI); | 119 | m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Creating agent at {0}", destination.ServerURI); |
120 | 120 | ||
121 | string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; | 121 | string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; |
122 | 122 | ||
123 | try | 123 | try |
124 | { | 124 | { |
125 | OSDMap args = aCircuit.PackAgentCircuitData(ctx); | 125 | OSDMap args = aCircuit.PackAgentCircuitData(ctx); |
@@ -137,7 +137,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
137 | myipaddress = data["your_ip"].AsString(); | 137 | myipaddress = data["your_ip"].AsString(); |
138 | return success; | 138 | return success; |
139 | } | 139 | } |
140 | 140 | ||
141 | // Try the old version, uncompressed | 141 | // Try the old version, uncompressed |
142 | result = WebUtil.PostToService(uri, args, 30000, false); | 142 | result = WebUtil.PostToService(uri, args, 30000, false); |
143 | 143 | ||
@@ -155,10 +155,10 @@ namespace OpenSim.Services.Connectors.Simulation | |||
155 | return success; | 155 | return success; |
156 | } | 156 | } |
157 | } | 157 | } |
158 | 158 | ||
159 | m_log.WarnFormat( | 159 | m_log.WarnFormat( |
160 | "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}", | 160 | "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}", |
161 | aCircuit.firstname, aCircuit.lastname, destination.RegionName); | 161 | aCircuit.firstname, aCircuit.lastname, destination.RegionName); |
162 | reason = result["Message"] != null ? result["Message"].AsString() : "error"; | 162 | reason = result["Message"] != null ? result["Message"].AsString() : "error"; |
163 | return false; | 163 | return false; |
164 | } | 164 | } |
@@ -202,8 +202,8 @@ namespace OpenSim.Services.Connectors.Simulation | |||
202 | { | 202 | { |
203 | if (m_updateAgentQueue.ContainsKey(uri)) | 203 | if (m_updateAgentQueue.ContainsKey(uri)) |
204 | { | 204 | { |
205 | // Another thread is already handling | 205 | // Another thread is already handling |
206 | // updates for this simulator, just update | 206 | // updates for this simulator, just update |
207 | // the position and return, overwrites are | 207 | // the position and return, overwrites are |
208 | // not a problem since we only care about the | 208 | // not a problem since we only care about the |
209 | // last update anyway | 209 | // last update anyway |
@@ -304,7 +304,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
304 | OSDMap request = new OSDMap(); | 304 | OSDMap request = new OSDMap(); |
305 | request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); | 305 | request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); |
306 | request.Add("position", OSD.FromString(position.ToString())); | 306 | request.Add("position", OSD.FromString(position.ToString())); |
307 | // To those who still understad this field, we're telling them | 307 | // To those who still understad this field, we're telling them |
308 | // the lowest version just to be safe | 308 | // the lowest version just to be safe |
309 | request.Add("my_version", OSD.FromString(String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersionSupportedMin))); | 309 | request.Add("my_version", OSD.FromString(String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersionSupportedMin))); |
310 | // New simulation service negotiation | 310 | // New simulation service negotiation |
@@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
374 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored"); | 374 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored"); |
375 | return true; | 375 | return true; |
376 | } | 376 | } |
377 | 377 | ||
378 | reason = result["Message"]; | 378 | reason = result["Message"]; |
379 | } | 379 | } |
380 | else | 380 | else |
@@ -410,7 +410,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
410 | { | 410 | { |
411 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] QueryAcesss failed with exception; {0}",e.ToString()); | 411 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] QueryAcesss failed with exception; {0}",e.ToString()); |
412 | } | 412 | } |
413 | 413 | ||
414 | return false; | 414 | return false; |
415 | } | 415 | } |
416 | 416 | ||
@@ -428,7 +428,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
428 | { | 428 | { |
429 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] ReleaseAgent failed with exception; {0}",e.ToString()); | 429 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] ReleaseAgent failed with exception; {0}",e.ToString()); |
430 | } | 430 | } |
431 | 431 | ||
432 | return true; | 432 | return true; |
433 | } | 433 | } |
434 | 434 | ||
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs index 5bc7a1c..68ae7bb 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | |||
@@ -198,7 +198,7 @@ namespace OpenSim.Services.Connectors | |||
198 | accs = doGetMultiUserAccounts(scopeID, IDs, out multisuported); | 198 | accs = doGetMultiUserAccounts(scopeID, IDs, out multisuported); |
199 | if(multisuported) | 199 | if(multisuported) |
200 | return accs; | 200 | return accs; |
201 | 201 | ||
202 | // service does not do multi accounts so need to do it one by one | 202 | // service does not do multi accounts so need to do it one by one |
203 | 203 | ||
204 | UUID uuid = UUID.Zero; | 204 | UUID uuid = UUID.Zero; |
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors | |||
344 | 344 | ||
345 | return SendAndGetReply(sendData); | 345 | return SendAndGetReply(sendData); |
346 | } | 346 | } |
347 | 347 | ||
348 | private UserAccount SendAndGetReply(Dictionary<string, object> sendData) | 348 | private UserAccount SendAndGetReply(Dictionary<string, object> sendData) |
349 | { | 349 | { |
350 | string reply = string.Empty; | 350 | string reply = string.Empty; |
diff --git a/OpenSim/Services/EstateService/EstateDataService.cs b/OpenSim/Services/EstateService/EstateDataService.cs index f6a8654..f051ffb 100644 --- a/OpenSim/Services/EstateService/EstateDataService.cs +++ b/OpenSim/Services/EstateService/EstateDataService.cs | |||
@@ -92,11 +92,11 @@ namespace OpenSim.Services.EstateService | |||
92 | { | 92 | { |
93 | return m_database.CreateNewEstate(); | 93 | return m_database.CreateNewEstate(); |
94 | } | 94 | } |
95 | 95 | ||
96 | public List<EstateSettings> LoadEstateSettingsAll() | 96 | public List<EstateSettings> LoadEstateSettingsAll() |
97 | { | 97 | { |
98 | return m_database.LoadEstateSettingsAll(); | 98 | return m_database.LoadEstateSettingsAll(); |
99 | } | 99 | } |
100 | 100 | ||
101 | public void StoreEstateSettings(EstateSettings es) | 101 | public void StoreEstateSettings(EstateSettings es) |
102 | { | 102 | { |
@@ -107,7 +107,7 @@ namespace OpenSim.Services.EstateService | |||
107 | { | 107 | { |
108 | return m_database.GetEstates(search); | 108 | return m_database.GetEstates(search); |
109 | } | 109 | } |
110 | 110 | ||
111 | public List<int> GetEstatesAll() | 111 | public List<int> GetEstatesAll() |
112 | { | 112 | { |
113 | return m_database.GetEstatesAll(); | 113 | return m_database.GetEstatesAll(); |
diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs index cddd288..ca2f459 100644 --- a/OpenSim/Services/FSAssetService/FSAssetService.cs +++ b/OpenSim/Services/FSAssetService/FSAssetService.cs | |||
@@ -115,7 +115,7 @@ namespace OpenSim.Services.FSAssetService | |||
115 | } | 115 | } |
116 | 116 | ||
117 | IConfig assetConfig = config.Configs[configName]; | 117 | IConfig assetConfig = config.Configs[configName]; |
118 | 118 | ||
119 | if (assetConfig == null) | 119 | if (assetConfig == null) |
120 | throw new Exception("No AssetService configuration"); | 120 | throw new Exception("No AssetService configuration"); |
121 | 121 | ||
@@ -128,12 +128,12 @@ namespace OpenSim.Services.FSAssetService | |||
128 | 128 | ||
129 | // If not found above, fallback to Database defaults | 129 | // If not found above, fallback to Database defaults |
130 | IConfig dbConfig = config.Configs["DatabaseService"]; | 130 | IConfig dbConfig = config.Configs["DatabaseService"]; |
131 | 131 | ||
132 | if (dbConfig != null) | 132 | if (dbConfig != null) |
133 | { | 133 | { |
134 | if (dllName == String.Empty) | 134 | if (dllName == String.Empty) |
135 | dllName = dbConfig.GetString("StorageProvider", String.Empty); | 135 | dllName = dbConfig.GetString("StorageProvider", String.Empty); |
136 | 136 | ||
137 | if (connectionString == String.Empty) | 137 | if (connectionString == String.Empty) |
138 | connectionString = dbConfig.GetString("ConnectionString", String.Empty); | 138 | connectionString = dbConfig.GetString("ConnectionString", String.Empty); |
139 | } | 139 | } |
@@ -156,7 +156,7 @@ namespace OpenSim.Services.FSAssetService | |||
156 | 156 | ||
157 | // Setup Fallback Service | 157 | // Setup Fallback Service |
158 | string str = assetConfig.GetString("FallbackService", string.Empty); | 158 | string str = assetConfig.GetString("FallbackService", string.Empty); |
159 | 159 | ||
160 | if (str != string.Empty) | 160 | if (str != string.Empty) |
161 | { | 161 | { |
162 | object[] args = new object[] { config }; | 162 | object[] args = new object[] { config }; |
@@ -204,7 +204,7 @@ namespace OpenSim.Services.FSAssetService | |||
204 | Store(a, false); | 204 | Store(a, false); |
205 | }); | 205 | }); |
206 | } | 206 | } |
207 | 207 | ||
208 | m_WriterThread = new Thread(Writer); | 208 | m_WriterThread = new Thread(Writer); |
209 | m_WriterThread.Start(); | 209 | m_WriterThread.Start(); |
210 | 210 | ||
@@ -214,7 +214,7 @@ namespace OpenSim.Services.FSAssetService | |||
214 | m_StatsThread.Start(); | 214 | m_StatsThread.Start(); |
215 | } | 215 | } |
216 | } | 216 | } |
217 | 217 | ||
218 | m_log.Info("[FSASSETS]: FS asset service enabled"); | 218 | m_log.Info("[FSASSETS]: FS asset service enabled"); |
219 | } | 219 | } |
220 | 220 | ||
@@ -223,7 +223,7 @@ namespace OpenSim.Services.FSAssetService | |||
223 | while (true) | 223 | while (true) |
224 | { | 224 | { |
225 | Thread.Sleep(60000); | 225 | Thread.Sleep(60000); |
226 | 226 | ||
227 | lock (m_statsLock) | 227 | lock (m_statsLock) |
228 | { | 228 | { |
229 | if (m_readCount > 0) | 229 | if (m_readCount > 0) |
@@ -723,7 +723,7 @@ namespace OpenSim.Services.FSAssetService | |||
723 | AssetBase asset = Get(args[2], out hash); | 723 | AssetBase asset = Get(args[2], out hash); |
724 | 724 | ||
725 | if (asset == null || asset.Data.Length == 0) | 725 | if (asset == null || asset.Data.Length == 0) |
726 | { | 726 | { |
727 | MainConsole.Instance.Output("Asset not found"); | 727 | MainConsole.Instance.Output("Asset not found"); |
728 | return; | 728 | return; |
729 | } | 729 | } |
@@ -765,7 +765,7 @@ namespace OpenSim.Services.FSAssetService | |||
765 | AssetBase asset = Get(args[2]); | 765 | AssetBase asset = Get(args[2]); |
766 | 766 | ||
767 | if (asset == null || asset.Data.Length == 0) | 767 | if (asset == null || asset.Data.Length == 0) |
768 | { | 768 | { |
769 | MainConsole.Instance.Output("Asset not found"); | 769 | MainConsole.Instance.Output("Asset not found"); |
770 | return; | 770 | return; |
771 | } | 771 | } |
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs index 201e72f..970d682 100644 --- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs +++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Services.FreeswitchService | |||
74 | response["str_response_string"] = String.Format(@"<?xml version=""1.0"" encoding=""utf-8""?> | 74 | response["str_response_string"] = String.Format(@"<?xml version=""1.0"" encoding=""utf-8""?> |
75 | <document type=""freeswitch/xml""> | 75 | <document type=""freeswitch/xml""> |
76 | <section name=""dialplan""> | 76 | <section name=""dialplan""> |
77 | <context name=""{0}"">" + | 77 | <context name=""{0}"">" + |
78 | 78 | ||
79 | /* <!-- dial via SIP uri --> | 79 | /* <!-- dial via SIP uri --> |
80 | <extension name=""sip_uri""> | 80 | <extension name=""sip_uri""> |
@@ -116,21 +116,21 @@ namespace OpenSim.Services.FreeswitchService | |||
116 | { | 116 | { |
117 | Hashtable response = new Hashtable(); | 117 | Hashtable response = new Hashtable(); |
118 | string domain = (string) request["domain"]; | 118 | string domain = (string) request["domain"]; |
119 | if (domain != m_freeSwitchRealm) | 119 | if (domain != m_freeSwitchRealm) |
120 | { | 120 | { |
121 | response["content_type"] = "text/xml"; | 121 | response["content_type"] = "text/xml"; |
122 | response["keepalive"] = false; | 122 | response["keepalive"] = false; |
123 | response["int_response_code"] = 200; | 123 | response["int_response_code"] = 200; |
124 | response["str_response_string"] = ""; | 124 | response["str_response_string"] = ""; |
125 | } | 125 | } |
126 | else | 126 | else |
127 | { | 127 | { |
128 | // m_log.DebugFormat("[FreeSwitchDirectory]: HandleDirectoryRequest called with {0}",request.ToString()); | 128 | // m_log.DebugFormat("[FreeSwitchDirectory]: HandleDirectoryRequest called with {0}",request.ToString()); |
129 | 129 | ||
130 | // information in the request we might be interested in | 130 | // information in the request we might be interested in |
131 | 131 | ||
132 | // Request 1 sip_auth for users account | 132 | // Request 1 sip_auth for users account |
133 | 133 | ||
134 | //Event-Calling-Function=sofia_reg_parse_auth | 134 | //Event-Calling-Function=sofia_reg_parse_auth |
135 | //Event-Calling-Line-Number=1494 | 135 | //Event-Calling-Line-Number=1494 |
136 | //action=sip_auth | 136 | //action=sip_auth |
@@ -145,10 +145,10 @@ namespace OpenSim.Services.FreeswitchService | |||
145 | //user=xhZuXKmRpECyr2AARJYyGgg%3D%3D | 145 | //user=xhZuXKmRpECyr2AARJYyGgg%3D%3D |
146 | //domain=9.20.151.43 | 146 | //domain=9.20.151.43 |
147 | //ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup | 147 | //ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup |
148 | 148 | ||
149 | // foreach (DictionaryEntry item in request) | 149 | // foreach (DictionaryEntry item in request) |
150 | // m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value); | 150 | // m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value); |
151 | 151 | ||
152 | string eventCallingFunction = (string) request["Event-Calling-Function"]; | 152 | string eventCallingFunction = (string) request["Event-Calling-Function"]; |
153 | if (eventCallingFunction == null) | 153 | if (eventCallingFunction == null) |
154 | { | 154 | { |
@@ -159,15 +159,15 @@ namespace OpenSim.Services.FreeswitchService | |||
159 | { | 159 | { |
160 | eventCallingFunction = "sofia_reg_parse_auth"; | 160 | eventCallingFunction = "sofia_reg_parse_auth"; |
161 | } | 161 | } |
162 | 162 | ||
163 | if (eventCallingFunction == "sofia_reg_parse_auth") | 163 | if (eventCallingFunction == "sofia_reg_parse_auth") |
164 | { | 164 | { |
165 | string sipAuthMethod = (string)request["sip_auth_method"]; | 165 | string sipAuthMethod = (string)request["sip_auth_method"]; |
166 | 166 | ||
167 | if (sipAuthMethod == "REGISTER") | 167 | if (sipAuthMethod == "REGISTER") |
168 | { | 168 | { |
169 | response = HandleRegister(m_freeSwitchContext, m_freeSwitchRealm, request); | 169 | response = HandleRegister(m_freeSwitchContext, m_freeSwitchRealm, request); |
170 | } | 170 | } |
171 | else if (sipAuthMethod == "INVITE") | 171 | else if (sipAuthMethod == "INVITE") |
172 | { | 172 | { |
173 | response = HandleInvite(m_freeSwitchContext, m_freeSwitchRealm, request); | 173 | response = HandleInvite(m_freeSwitchContext, m_freeSwitchRealm, request); |
@@ -215,16 +215,16 @@ namespace OpenSim.Services.FreeswitchService | |||
215 | } | 215 | } |
216 | return response; | 216 | return response; |
217 | } | 217 | } |
218 | 218 | ||
219 | private Hashtable HandleRegister(string Context, string Realm, Hashtable request) | 219 | private Hashtable HandleRegister(string Context, string Realm, Hashtable request) |
220 | { | 220 | { |
221 | m_log.Info("[FreeSwitchDirectory]: HandleRegister called"); | 221 | m_log.Info("[FreeSwitchDirectory]: HandleRegister called"); |
222 | 222 | ||
223 | // TODO the password we return needs to match that sent in the request, this is hard coded for now | 223 | // TODO the password we return needs to match that sent in the request, this is hard coded for now |
224 | string password = "1234"; | 224 | string password = "1234"; |
225 | string domain = (string) request["domain"]; | 225 | string domain = (string) request["domain"]; |
226 | string user = (string) request["user"]; | 226 | string user = (string) request["user"]; |
227 | 227 | ||
228 | Hashtable response = new Hashtable(); | 228 | Hashtable response = new Hashtable(); |
229 | response["content_type"] = "text/xml"; | 229 | response["content_type"] = "text/xml"; |
230 | response["keepalive"] = false; | 230 | response["keepalive"] = false; |
@@ -249,20 +249,20 @@ namespace OpenSim.Services.FreeswitchService | |||
249 | "</section>\r\n" + | 249 | "</section>\r\n" + |
250 | "</document>\r\n", | 250 | "</document>\r\n", |
251 | domain , user, password, Context); | 251 | domain , user, password, Context); |
252 | 252 | ||
253 | return response; | 253 | return response; |
254 | } | 254 | } |
255 | 255 | ||
256 | private Hashtable HandleInvite(string Context, string Realm, Hashtable request) | 256 | private Hashtable HandleInvite(string Context, string Realm, Hashtable request) |
257 | { | 257 | { |
258 | m_log.Info("[FreeSwitchDirectory]: HandleInvite called"); | 258 | m_log.Info("[FreeSwitchDirectory]: HandleInvite called"); |
259 | 259 | ||
260 | // TODO the password we return needs to match that sent in the request, this is hard coded for now | 260 | // TODO the password we return needs to match that sent in the request, this is hard coded for now |
261 | string password = "1234"; | 261 | string password = "1234"; |
262 | string domain = (string) request["domain"]; | 262 | string domain = (string) request["domain"]; |
263 | string user = (string) request["user"]; | 263 | string user = (string) request["user"]; |
264 | string sipRequestUser = (string) request["sip_request_user"]; | 264 | string sipRequestUser = (string) request["sip_request_user"]; |
265 | 265 | ||
266 | Hashtable response = new Hashtable(); | 266 | Hashtable response = new Hashtable(); |
267 | response["content_type"] = "text/xml"; | 267 | response["content_type"] = "text/xml"; |
268 | response["keepalive"] = false; | 268 | response["keepalive"] = false; |
@@ -296,18 +296,18 @@ namespace OpenSim.Services.FreeswitchService | |||
296 | "</section>\r\n" + | 296 | "</section>\r\n" + |
297 | "</document>\r\n", | 297 | "</document>\r\n", |
298 | domain , user, password,sipRequestUser, Context); | 298 | domain , user, password,sipRequestUser, Context); |
299 | 299 | ||
300 | return response; | 300 | return response; |
301 | } | 301 | } |
302 | 302 | ||
303 | private Hashtable HandleLocateUser(String Realm, Hashtable request) | 303 | private Hashtable HandleLocateUser(String Realm, Hashtable request) |
304 | { | 304 | { |
305 | m_log.Info("[FreeSwitchDirectory]: HandleLocateUser called"); | 305 | m_log.Info("[FreeSwitchDirectory]: HandleLocateUser called"); |
306 | 306 | ||
307 | // TODO the password we return needs to match that sent in the request, this is hard coded for now | 307 | // TODO the password we return needs to match that sent in the request, this is hard coded for now |
308 | string domain = (string) request["domain"]; | 308 | string domain = (string) request["domain"]; |
309 | string user = (string) request["user"]; | 309 | string user = (string) request["user"]; |
310 | 310 | ||
311 | Hashtable response = new Hashtable(); | 311 | Hashtable response = new Hashtable(); |
312 | response["content_type"] = "text/xml"; | 312 | response["content_type"] = "text/xml"; |
313 | response["keepalive"] = false; | 313 | response["keepalive"] = false; |
@@ -330,17 +330,17 @@ namespace OpenSim.Services.FreeswitchService | |||
330 | "</section>\r\n" + | 330 | "</section>\r\n" + |
331 | "</document>\r\n", | 331 | "</document>\r\n", |
332 | domain , user); | 332 | domain , user); |
333 | 333 | ||
334 | return response; | 334 | return response; |
335 | } | 335 | } |
336 | 336 | ||
337 | private Hashtable HandleConfigSofia(string Context, string Realm, Hashtable request) | 337 | private Hashtable HandleConfigSofia(string Context, string Realm, Hashtable request) |
338 | { | 338 | { |
339 | m_log.Info("[FreeSwitchDirectory]: HandleConfigSofia called."); | 339 | m_log.Info("[FreeSwitchDirectory]: HandleConfigSofia called."); |
340 | 340 | ||
341 | // TODO the password we return needs to match that sent in the request, this is hard coded for now | 341 | // TODO the password we return needs to match that sent in the request, this is hard coded for now |
342 | string domain = (string) request["domain"]; | 342 | string domain = (string) request["domain"]; |
343 | 343 | ||
344 | Hashtable response = new Hashtable(); | 344 | Hashtable response = new Hashtable(); |
345 | response["content_type"] = "text/xml"; | 345 | response["content_type"] = "text/xml"; |
346 | response["keepalive"] = false; | 346 | response["keepalive"] = false; |
@@ -381,9 +381,9 @@ namespace OpenSim.Services.FreeswitchService | |||
381 | "</variables>\r\n"+ | 381 | "</variables>\r\n"+ |
382 | "</domain>\r\n" + | 382 | "</domain>\r\n" + |
383 | "</section>\r\n" + | 383 | "</section>\r\n" + |
384 | "</document>\r\n", | 384 | "</document>\r\n", |
385 | domain, Context); | 385 | domain, Context); |
386 | 386 | ||
387 | return response; | 387 | return response; |
388 | } | 388 | } |
389 | 389 | ||
diff --git a/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs b/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs index d8ee971..bfeb388d 100644 --- a/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.FreeswitchService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.FreeswitchService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs index 5b97ac0..3e6447a 100644 --- a/OpenSim/Services/Friends/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/Friends/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.FriendsService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.FriendsService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index aa13a67..6153f5e 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Services.GridService | |||
72 | if (gridConfig != null) | 72 | if (gridConfig != null) |
73 | { | 73 | { |
74 | m_DeleteOnUnregister = gridConfig.GetBoolean("DeleteOnUnregister", true); | 74 | m_DeleteOnUnregister = gridConfig.GetBoolean("DeleteOnUnregister", true); |
75 | 75 | ||
76 | string authService = gridConfig.GetString("AuthenticationService", String.Empty); | 76 | string authService = gridConfig.GetString("AuthenticationService", String.Empty); |
77 | 77 | ||
78 | if (authService != String.Empty) | 78 | if (authService != String.Empty) |
@@ -200,7 +200,7 @@ namespace OpenSim.Services.GridService | |||
200 | if (regionInfos.RegionLocY <= Constants.MaximumRegionSize) | 200 | if (regionInfos.RegionLocY <= Constants.MaximumRegionSize) |
201 | return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString(); | 201 | return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString(); |
202 | 202 | ||
203 | String reason = "Region overlaps another region"; | 203 | String reason = "Region overlaps another region"; |
204 | 204 | ||
205 | List<RegionData> rdatas = m_Database.Get( | 205 | List<RegionData> rdatas = m_Database.Get( |
206 | regionInfos.RegionLocX, | 206 | regionInfos.RegionLocX, |
@@ -272,7 +272,7 @@ namespace OpenSim.Services.GridService | |||
272 | { | 272 | { |
273 | if (d.RegionID != regionInfos.RegionID) | 273 | if (d.RegionID != regionInfos.RegionID) |
274 | { | 274 | { |
275 | m_log.WarnFormat("[GRID SERVICE]: Region tried to register using a duplicate name. New region: {0} ({1}), existing region: {2} ({3}).", | 275 | m_log.WarnFormat("[GRID SERVICE]: Region tried to register using a duplicate name. New region: {0} ({1}), existing region: {2} ({3}).", |
276 | regionInfos.RegionName, regionInfos.RegionID, d.RegionName, d.RegionID); | 276 | regionInfos.RegionName, regionInfos.RegionID, d.RegionName, d.RegionID); |
277 | return "Duplicate region name"; | 277 | return "Duplicate region name"; |
278 | } | 278 | } |
@@ -282,7 +282,7 @@ namespace OpenSim.Services.GridService | |||
282 | 282 | ||
283 | // If there is an old record for us, delete it if it is elsewhere. | 283 | // If there is an old record for us, delete it if it is elsewhere. |
284 | region = m_Database.Get(regionInfos.RegionID, scopeID); | 284 | region = m_Database.Get(regionInfos.RegionID, scopeID); |
285 | if ((region != null) && (region.RegionID == regionInfos.RegionID) && | 285 | if ((region != null) && (region.RegionID == regionInfos.RegionID) && |
286 | ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY))) | 286 | ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY))) |
287 | { | 287 | { |
288 | if ((Convert.ToInt32(region.Data["flags"]) & (int)OpenSim.Framework.RegionFlags.NoMove) != 0) | 288 | if ((Convert.ToInt32(region.Data["flags"]) & (int)OpenSim.Framework.RegionFlags.NoMove) != 0) |
@@ -308,7 +308,7 @@ namespace OpenSim.Services.GridService | |||
308 | // Everything is ok, let's register | 308 | // Everything is ok, let's register |
309 | RegionData rdata = RegionInfo2RegionData(regionInfos); | 309 | RegionData rdata = RegionInfo2RegionData(regionInfos); |
310 | rdata.ScopeID = scopeID; | 310 | rdata.ScopeID = scopeID; |
311 | 311 | ||
312 | if (region != null) | 312 | if (region != null) |
313 | { | 313 | { |
314 | int oldFlags = Convert.ToInt32(region.Data["flags"]); | 314 | int oldFlags = Convert.ToInt32(region.Data["flags"]); |
@@ -346,9 +346,9 @@ namespace OpenSim.Services.GridService | |||
346 | } | 346 | } |
347 | 347 | ||
348 | m_log.DebugFormat | 348 | m_log.DebugFormat |
349 | ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", | 349 | ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", |
350 | regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, | 350 | regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, |
351 | regionInfos.RegionCoordX, regionInfos.RegionCoordY, | 351 | regionInfos.RegionCoordX, regionInfos.RegionCoordY, |
352 | (OpenSim.Framework.RegionFlags)flags); | 352 | (OpenSim.Framework.RegionFlags)flags); |
353 | 353 | ||
354 | return String.Empty; | 354 | return String.Empty; |
@@ -404,7 +404,7 @@ namespace OpenSim.Services.GridService | |||
404 | { | 404 | { |
405 | List<GridRegion> rinfos = new List<GridRegion>(); | 405 | List<GridRegion> rinfos = new List<GridRegion>(); |
406 | RegionData region = m_Database.Get(regionID, scopeID); | 406 | RegionData region = m_Database.Get(regionID, scopeID); |
407 | 407 | ||
408 | if (region != null) | 408 | if (region != null) |
409 | { | 409 | { |
410 | List<RegionData> rdatas = m_Database.Get( | 410 | List<RegionData> rdatas = m_Database.Get( |
@@ -430,10 +430,10 @@ namespace OpenSim.Services.GridService | |||
430 | else | 430 | else |
431 | { | 431 | { |
432 | m_log.WarnFormat( | 432 | m_log.WarnFormat( |
433 | "[GRID SERVICE]: GetNeighbours() called for scope {0}, region {1} but no such region found", | 433 | "[GRID SERVICE]: GetNeighbours() called for scope {0}, region {1} but no such region found", |
434 | scopeID, regionID); | 434 | scopeID, regionID); |
435 | } | 435 | } |
436 | 436 | ||
437 | return rinfos; | 437 | return rinfos; |
438 | } | 438 | } |
439 | 439 | ||
@@ -451,7 +451,7 @@ namespace OpenSim.Services.GridService | |||
451 | // be the base coordinate of the region. | 451 | // be the base coordinate of the region. |
452 | // The snapping is technically unnecessary but is harmless because regions are always | 452 | // The snapping is technically unnecessary but is harmless because regions are always |
453 | // multiples of the legacy region size (256). | 453 | // multiples of the legacy region size (256). |
454 | 454 | ||
455 | public GridRegion GetRegionByPosition(UUID scopeID, int x, int y) | 455 | public GridRegion GetRegionByPosition(UUID scopeID, int x, int y) |
456 | { | 456 | { |
457 | uint regionX = Util.WorldToRegionLoc((uint)x); | 457 | uint regionX = Util.WorldToRegionLoc((uint)x); |
@@ -505,7 +505,7 @@ namespace OpenSim.Services.GridService | |||
505 | string regionName = ""; | 505 | string regionName = ""; |
506 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName)) | 506 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName)) |
507 | return null; | 507 | return null; |
508 | 508 | ||
509 | string mapname; | 509 | string mapname; |
510 | bool localGrid = m_HypergridLinker.IsLocalGrid(regionURI); | 510 | bool localGrid = m_HypergridLinker.IsLocalGrid(regionURI); |
511 | if(localGrid) | 511 | if(localGrid) |
@@ -531,11 +531,11 @@ namespace OpenSim.Services.GridService | |||
531 | rinfos.Add(RegionData2RegionInfo(rdata)); | 531 | rinfos.Add(RegionData2RegionInfo(rdata)); |
532 | } | 532 | } |
533 | } | 533 | } |
534 | } | 534 | } |
535 | if(haveMatch) | 535 | if(haveMatch) |
536 | return rinfos; | 536 | return rinfos; |
537 | } | 537 | } |
538 | 538 | ||
539 | rdatas = m_Database.Get(Util.EscapeForLike(mapname)+ "%", scopeID); | 539 | rdatas = m_Database.Get(Util.EscapeForLike(mapname)+ "%", scopeID); |
540 | if (rdatas != null && (rdatas.Count > 0)) | 540 | if (rdatas != null && (rdatas.Count > 0)) |
541 | { | 541 | { |
@@ -554,7 +554,7 @@ namespace OpenSim.Services.GridService | |||
554 | break; | 554 | break; |
555 | } | 555 | } |
556 | } | 556 | } |
557 | } | 557 | } |
558 | if(haveMatch) | 558 | if(haveMatch) |
559 | return rinfos; | 559 | return rinfos; |
560 | } | 560 | } |
@@ -597,7 +597,7 @@ namespace OpenSim.Services.GridService | |||
597 | string regionName = ""; | 597 | string regionName = ""; |
598 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName)) | 598 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName)) |
599 | return null; | 599 | return null; |
600 | 600 | ||
601 | string mapname; | 601 | string mapname; |
602 | bool localGrid = m_HypergridLinker.IsLocalGrid(regionURI); | 602 | bool localGrid = m_HypergridLinker.IsLocalGrid(regionURI); |
603 | if(localGrid) | 603 | if(localGrid) |
@@ -666,7 +666,7 @@ namespace OpenSim.Services.GridService | |||
666 | return rinfo; | 666 | return rinfo; |
667 | } | 667 | } |
668 | 668 | ||
669 | #endregion | 669 | #endregion |
670 | 670 | ||
671 | public List<GridRegion> GetDefaultRegions(UUID scopeID) | 671 | public List<GridRegion> GetDefaultRegions(UUID scopeID) |
672 | { | 672 | { |
@@ -705,7 +705,7 @@ namespace OpenSim.Services.GridService | |||
705 | int normalDefaultRegionsFoundOnline = ret.Count - hgDefaultRegionsFoundOnline; | 705 | int normalDefaultRegionsFoundOnline = ret.Count - hgDefaultRegionsFoundOnline; |
706 | 706 | ||
707 | m_log.DebugFormat( | 707 | m_log.DebugFormat( |
708 | "[GRID SERVICE]: GetDefaultHypergridRegions returning {0} hypergrid default and {1} normal default regions", | 708 | "[GRID SERVICE]: GetDefaultHypergridRegions returning {0} hypergrid default and {1} normal default regions", |
709 | hgDefaultRegionsFoundOnline, normalDefaultRegionsFoundOnline); | 709 | hgDefaultRegionsFoundOnline, normalDefaultRegionsFoundOnline); |
710 | 710 | ||
711 | return ret; | 711 | return ret; |
@@ -742,7 +742,7 @@ namespace OpenSim.Services.GridService | |||
742 | m_log.DebugFormat("[GRID SERVICE]: Hyperlinks returned {0} regions", ret.Count); | 742 | m_log.DebugFormat("[GRID SERVICE]: Hyperlinks returned {0} regions", ret.Count); |
743 | return ret; | 743 | return ret; |
744 | } | 744 | } |
745 | 745 | ||
746 | public int GetRegionFlags(UUID scopeID, UUID regionID) | 746 | public int GetRegionFlags(UUID scopeID, UUID regionID) |
747 | { | 747 | { |
748 | RegionData region = m_Database.Get(regionID, scopeID); | 748 | RegionData region = m_Database.Get(regionID, scopeID); |
@@ -994,7 +994,7 @@ namespace OpenSim.Services.GridService | |||
994 | } | 994 | } |
995 | 995 | ||
996 | /// <summary> | 996 | /// <summary> |
997 | /// Gets the grid extra service URls we wish for the region to send in OpenSimExtras to dynamically refresh | 997 | /// Gets the grid extra service URls we wish for the region to send in OpenSimExtras to dynamically refresh |
998 | /// parameters in the viewer used to access services like map, search and destination guides. | 998 | /// parameters in the viewer used to access services like map, search and destination guides. |
999 | /// <para>see "SimulatorFeaturesModule" </para> | 999 | /// <para>see "SimulatorFeaturesModule" </para> |
1000 | /// </summary> | 1000 | /// </summary> |
diff --git a/OpenSim/Services/GridService/GridServiceBase.cs b/OpenSim/Services/GridService/GridServiceBase.cs index 444f79b..7522e64 100644 --- a/OpenSim/Services/GridService/GridServiceBase.cs +++ b/OpenSim/Services/GridService/GridServiceBase.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Services.GridService | |||
68 | connString = gridConfig.GetString("ConnectionString", connString); | 68 | connString = gridConfig.GetString("ConnectionString", connString); |
69 | realm = gridConfig.GetString("Realm", realm); | 69 | realm = gridConfig.GetString("Realm", realm); |
70 | } | 70 | } |
71 | 71 | ||
72 | // | 72 | // |
73 | // We tried, but this doesn't exist. We can't proceed. | 73 | // We tried, but this doesn't exist. We can't proceed. |
74 | // | 74 | // |
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index aa394ce..dabfd3b 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -196,7 +196,7 @@ namespace OpenSim.Services.GridService | |||
196 | { | 196 | { |
197 | return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason); | 197 | return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason); |
198 | } | 198 | } |
199 | 199 | ||
200 | public bool IsLocalGrid(string serverURI) | 200 | public bool IsLocalGrid(string serverURI) |
201 | { | 201 | { |
202 | return serverURI == m_ThisGatekeeper; | 202 | return serverURI == m_ThisGatekeeper; |
@@ -240,7 +240,7 @@ namespace OpenSim.Services.GridService | |||
240 | 240 | ||
241 | private bool TryCreateLinkImpl(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason) | 241 | private bool TryCreateLinkImpl(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason) |
242 | { | 242 | { |
243 | m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>", | 243 | m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>", |
244 | ((serverURI == null) ? (externalHostName + ":" + externalPort) : serverURI), | 244 | ((serverURI == null) ? (externalHostName + ":" + externalPort) : serverURI), |
245 | remoteRegionName, Util.WorldToRegionLoc((uint)xloc), Util.WorldToRegionLoc((uint)yloc)); | 245 | remoteRegionName, Util.WorldToRegionLoc((uint)xloc), Util.WorldToRegionLoc((uint)yloc)); |
246 | 246 | ||
@@ -270,7 +270,7 @@ namespace OpenSim.Services.GridService | |||
270 | 270 | ||
271 | if (remoteRegionName != string.Empty) | 271 | if (remoteRegionName != string.Empty) |
272 | regInfo.RegionName = remoteRegionName; | 272 | regInfo.RegionName = remoteRegionName; |
273 | 273 | ||
274 | regInfo.RegionLocX = xloc; | 274 | regInfo.RegionLocX = xloc; |
275 | regInfo.RegionLocY = yloc; | 275 | regInfo.RegionLocY = yloc; |
276 | regInfo.ScopeID = scopeID; | 276 | regInfo.ScopeID = scopeID; |
@@ -359,7 +359,7 @@ namespace OpenSim.Services.GridService | |||
359 | regInfo.RegionName = externalName; | 359 | regInfo.RegionName = externalName; |
360 | 360 | ||
361 | m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString()); | 361 | m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString()); |
362 | 362 | ||
363 | // Get the map image | 363 | // Get the map image |
364 | regInfo.TerrainImage = GetMapImage(regionID, imageURL); | 364 | regInfo.TerrainImage = GetMapImage(regionID, imageURL); |
365 | 365 | ||
@@ -383,7 +383,7 @@ namespace OpenSim.Services.GridService | |||
383 | OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]); | 383 | OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]); |
384 | if ((rflags & OpenSim.Framework.RegionFlags.Hyperlink) != 0) | 384 | if ((rflags & OpenSim.Framework.RegionFlags.Hyperlink) != 0) |
385 | { | 385 | { |
386 | regInfo = new GridRegion(); | 386 | regInfo = new GridRegion(); |
387 | regInfo.RegionID = regions[0].RegionID; | 387 | regInfo.RegionID = regions[0].RegionID; |
388 | regInfo.ScopeID = m_ScopeID; | 388 | regInfo.ScopeID = m_ScopeID; |
389 | } | 389 | } |
@@ -491,7 +491,7 @@ namespace OpenSim.Services.GridService | |||
491 | { | 491 | { |
492 | MainConsole.Instance.Output( | 492 | MainConsole.Instance.Output( |
493 | String.Format("{0}\n{2,-32} {1}\n", | 493 | String.Format("{0}\n{2,-32} {1}\n", |
494 | r.RegionName, r.RegionID, | 494 | r.RegionName, r.RegionID, |
495 | String.Format("{0},{1} ({2},{3})", r.posX, r.posY, | 495 | String.Format("{0},{1} ({2},{3})", r.posX, r.posY, |
496 | Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY) | 496 | Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY) |
497 | ) | 497 | ) |
@@ -515,7 +515,7 @@ namespace OpenSim.Services.GridService | |||
515 | RunHGCommand(command, cmdparams); | 515 | RunHGCommand(command, cmdparams); |
516 | 516 | ||
517 | } | 517 | } |
518 | 518 | ||
519 | private void RunLinkRegionCommand(string[] cmdparams) | 519 | private void RunLinkRegionCommand(string[] cmdparams) |
520 | { | 520 | { |
521 | int xloc, yloc; | 521 | int xloc, yloc; |
@@ -573,7 +573,7 @@ namespace OpenSim.Services.GridService | |||
573 | if (cmdparams[2].StartsWith("http")) | 573 | if (cmdparams[2].StartsWith("http")) |
574 | { | 574 | { |
575 | RunLinkRegionCommand(cmdparams); | 575 | RunLinkRegionCommand(cmdparams); |
576 | } | 576 | } |
577 | else if (cmdparams[2].Contains(":")) | 577 | else if (cmdparams[2].Contains(":")) |
578 | { | 578 | { |
579 | // New format | 579 | // New format |
diff --git a/OpenSim/Services/GridService/Properties/AssemblyInfo.cs b/OpenSim/Services/GridService/Properties/AssemblyInfo.cs index 40a29b3..69a3c44 100644 --- a/OpenSim/Services/GridService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/GridService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.GridService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.GridService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 41e2b40..b80700f 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Services.HypergridService | |||
93 | // These are mandatory, the others aren't | 93 | // These are mandatory, the others aren't |
94 | if (gridService == string.Empty || presenceService == string.Empty) | 94 | if (gridService == string.Empty || presenceService == string.Empty) |
95 | throw new Exception("Incomplete specifications, Gatekeeper Service cannot function."); | 95 | throw new Exception("Incomplete specifications, Gatekeeper Service cannot function."); |
96 | 96 | ||
97 | string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString()); | 97 | string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString()); |
98 | UUID.TryParse(scope, out m_ScopeID); | 98 | UUID.TryParse(scope, out m_ScopeID); |
99 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); | 99 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); |
@@ -135,7 +135,7 @@ namespace OpenSim.Services.HypergridService | |||
135 | m_AllowedClients = Util.GetConfigVarFromSections<string>( | 135 | m_AllowedClients = Util.GetConfigVarFromSections<string>( |
136 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); | 136 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); |
137 | m_DeniedClients = Util.GetConfigVarFromSections<string>( | 137 | m_DeniedClients = Util.GetConfigVarFromSections<string>( |
138 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); | 138 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); |
139 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); | 139 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); |
140 | 140 | ||
141 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions); | 141 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions); |
@@ -219,11 +219,11 @@ namespace OpenSim.Services.HypergridService | |||
219 | { | 219 | { |
220 | // Don't even check the given regionID | 220 | // Don't even check the given regionID |
221 | m_log.DebugFormat( | 221 | m_log.DebugFormat( |
222 | "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", | 222 | "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", |
223 | m_DefaultGatewayRegion.RegionName, | 223 | m_DefaultGatewayRegion.RegionName, |
224 | m_DefaultGatewayRegion.RegionID, | 224 | m_DefaultGatewayRegion.RegionID, |
225 | m_DefaultGatewayRegion.ServerURI, | 225 | m_DefaultGatewayRegion.ServerURI, |
226 | agentID, | 226 | agentID, |
227 | agentHomeURI == null ? "" : " @ " + agentHomeURI); | 227 | agentHomeURI == null ? "" : " @ " + agentHomeURI); |
228 | 228 | ||
229 | message = "Teleporting to the default region."; | 229 | message = "Teleporting to the default region."; |
@@ -244,10 +244,10 @@ namespace OpenSim.Services.HypergridService | |||
244 | 244 | ||
245 | m_log.DebugFormat( | 245 | m_log.DebugFormat( |
246 | "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.", | 246 | "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.", |
247 | region.RegionName, | 247 | region.RegionName, |
248 | region.RegionID, | 248 | region.RegionID, |
249 | region.ServerURI, | 249 | region.ServerURI, |
250 | agentID, | 250 | agentID, |
251 | agentHomeURI == null ? "" : " @ " + agentHomeURI); | 251 | agentHomeURI == null ? "" : " @ " + agentHomeURI); |
252 | 252 | ||
253 | return region; | 253 | return region; |
@@ -308,7 +308,7 @@ namespace OpenSim.Services.HypergridService | |||
308 | return false; | 308 | return false; |
309 | } | 309 | } |
310 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Identity verified for {0} {1} @ {2}", aCircuit.firstname, aCircuit.lastname, authURL); | 310 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Identity verified for {0} {1} @ {2}", aCircuit.firstname, aCircuit.lastname, authURL); |
311 | 311 | ||
312 | // | 312 | // |
313 | // Check for impersonations | 313 | // Check for impersonations |
314 | // | 314 | // |
@@ -461,7 +461,7 @@ namespace OpenSim.Services.HypergridService | |||
461 | EntityTransferContext ctx = new EntityTransferContext(); | 461 | EntityTransferContext ctx = new EntityTransferContext(); |
462 | 462 | ||
463 | if (!m_SimulationService.QueryAccess( | 463 | if (!m_SimulationService.QueryAccess( |
464 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), | 464 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), |
465 | true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) | 465 | true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) |
466 | return false; | 466 | return false; |
467 | 467 | ||
@@ -495,7 +495,7 @@ namespace OpenSim.Services.HypergridService | |||
495 | } | 495 | } |
496 | else | 496 | else |
497 | { | 497 | { |
498 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); | 498 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); |
499 | 499 | ||
500 | try | 500 | try |
501 | { | 501 | { |
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs index b83fb1e..a66478e 100644 --- a/OpenSim/Services/HypergridService/HGAssetService.cs +++ b/OpenSim/Services/HypergridService/HGAssetService.cs | |||
@@ -164,7 +164,7 @@ namespace OpenSim.Services.HypergridService | |||
164 | return false; | 164 | return false; |
165 | } | 165 | } |
166 | 166 | ||
167 | #endregion | 167 | #endregion |
168 | 168 | ||
169 | protected void AdjustIdentifiers(AssetMetadata meta) | 169 | protected void AdjustIdentifiers(AssetMetadata meta) |
170 | { | 170 | { |
diff --git a/OpenSim/Services/HypergridService/HGFSAssetService.cs b/OpenSim/Services/HypergridService/HGFSAssetService.cs index 54e8ccb..2b30b3a 100644 --- a/OpenSim/Services/HypergridService/HGFSAssetService.cs +++ b/OpenSim/Services/HypergridService/HGFSAssetService.cs | |||
@@ -160,7 +160,7 @@ namespace OpenSim.Services.HypergridService | |||
160 | return false; | 160 | return false; |
161 | } | 161 | } |
162 | 162 | ||
163 | #endregion | 163 | #endregion |
164 | 164 | ||
165 | protected void AdjustIdentifiers(AssetMetadata meta) | 165 | protected void AdjustIdentifiers(AssetMetadata meta) |
166 | { | 166 | { |
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs index 6e35a88..d3b4f18 100644 --- a/OpenSim/Services/HypergridService/HGFriendsService.cs +++ b/OpenSim/Services/HypergridService/HGFriendsService.cs | |||
@@ -227,7 +227,7 @@ namespace OpenSim.Services.HypergridService | |||
227 | 227 | ||
228 | List<UUID> localFriendsOnline = new List<UUID>(); | 228 | List<UUID> localFriendsOnline = new List<UUID>(); |
229 | 229 | ||
230 | m_log.DebugFormat("[HGFRIENDS SERVICE]: Status notification: foreign user {0} wants to notify {1} local friends of {2} status", | 230 | m_log.DebugFormat("[HGFRIENDS SERVICE]: Status notification: foreign user {0} wants to notify {1} local friends of {2} status", |
231 | foreignUserID, friends.Count, (online ? "online" : "offline")); | 231 | foreignUserID, friends.Count, (online ? "online" : "offline")); |
232 | 232 | ||
233 | // First, let's double check that the reported friends are, indeed, friends of that user | 233 | // First, let's double check that the reported friends are, indeed, friends of that user |
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index 32ca09a..d1739cf 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs | |||
@@ -184,7 +184,7 @@ namespace OpenSim.Services.HypergridService | |||
184 | else if (o is string) | 184 | else if (o is string) |
185 | url = (string)o; | 185 | url = (string)o; |
186 | 186 | ||
187 | // We need to compare the current location with the previous | 187 | // We need to compare the current location with the previous |
188 | // or the recursive loop will never end because it will never try to lookup the agent again | 188 | // or the recursive loop will never end because it will never try to lookup the agent again |
189 | if (!firstTime) | 189 | if (!firstTime) |
190 | { | 190 | { |
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index a0d25e3..f14593e 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Services.HypergridService | |||
70 | // | 70 | // |
71 | IConfig invConfig = config.Configs[m_ConfigName]; | 71 | IConfig invConfig = config.Configs[m_ConfigName]; |
72 | if (invConfig != null) | 72 | if (invConfig != null) |
73 | { | 73 | { |
74 | // realm = authConfig.GetString("Realm", realm); | 74 | // realm = authConfig.GetString("Realm", realm); |
75 | string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty); | 75 | string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty); |
76 | if (userAccountsDll == string.Empty) | 76 | if (userAccountsDll == string.Empty) |
@@ -82,7 +82,7 @@ namespace OpenSim.Services.HypergridService | |||
82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); | 82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); |
83 | 83 | ||
84 | m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", | 84 | m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", |
85 | new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); | 85 | new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); |
86 | 86 | ||
87 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 87 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
88 | } | 88 | } |
@@ -113,7 +113,7 @@ namespace OpenSim.Services.HypergridService | |||
113 | 113 | ||
114 | if (folders.Length > 0) | 114 | if (folders.Length > 0) |
115 | return ConvertToOpenSim(folders[0]); | 115 | return ConvertToOpenSim(folders[0]); |
116 | 116 | ||
117 | // make one | 117 | // make one |
118 | XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase"); | 118 | XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase"); |
119 | return ConvertToOpenSim(suitcase); | 119 | return ConvertToOpenSim(suitcase); |
@@ -160,7 +160,7 @@ namespace OpenSim.Services.HypergridService | |||
160 | { | 160 | { |
161 | return new InventoryCollection[0]; | 161 | return new InventoryCollection[0]; |
162 | } | 162 | } |
163 | 163 | ||
164 | //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) | 164 | //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) |
165 | //{ | 165 | //{ |
166 | //} | 166 | //} |
diff --git a/OpenSim/Services/HypergridService/HGRemoteAssetService.cs b/OpenSim/Services/HypergridService/HGRemoteAssetService.cs index a53435b..5e98af9 100644 --- a/OpenSim/Services/HypergridService/HGRemoteAssetService.cs +++ b/OpenSim/Services/HypergridService/HGRemoteAssetService.cs | |||
@@ -196,7 +196,7 @@ namespace OpenSim.Services.HypergridService | |||
196 | return false; | 196 | return false; |
197 | } | 197 | } |
198 | 198 | ||
199 | #endregion | 199 | #endregion |
200 | 200 | ||
201 | protected void AdjustIdentifiers(AssetMetadata meta) | 201 | protected void AdjustIdentifiers(AssetMetadata meta) |
202 | { | 202 | { |
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 7f14e8e..d1f2e70 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
@@ -97,7 +97,7 @@ namespace OpenSim.Services.HypergridService | |||
97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); | 97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); |
98 | 98 | ||
99 | // m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", | 99 | // m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", |
100 | // new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); | 100 | // new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); |
101 | 101 | ||
102 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 102 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
103 | } | 103 | } |
@@ -318,7 +318,7 @@ namespace OpenSim.Services.HypergridService | |||
318 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ID, folder.Owner); | 318 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ID, folder.Owner); |
319 | return false; | 319 | return false; |
320 | } | 320 | } |
321 | 321 | ||
322 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID)) | 322 | if (!IsWithinSuitcaseTree(folder.Owner, folder.ParentID)) |
323 | { | 323 | { |
324 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ParentID, folder.Owner); | 324 | m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: MoveFolder: folder {0} (user {1}) is not within Suitcase tree", folder.ParentID, folder.Owner); |
@@ -505,11 +505,11 @@ namespace OpenSim.Services.HypergridService | |||
505 | // Warp! Root folder for travelers | 505 | // Warp! Root folder for travelers |
506 | XInventoryFolder[] folders = m_Database.GetFolders( | 506 | XInventoryFolder[] folders = m_Database.GetFolders( |
507 | new string[] { "agentID", "type" }, | 507 | new string[] { "agentID", "type" }, |
508 | new string[] { principalID.ToString(), ((int)FolderType.Suitcase).ToString() }); | 508 | new string[] { principalID.ToString(), ((int)FolderType.Suitcase).ToString() }); |
509 | 509 | ||
510 | if (folders != null && folders.Length > 0) | 510 | if (folders != null && folders.Length > 0) |
511 | return folders[0]; | 511 | return folders[0]; |
512 | 512 | ||
513 | // check to see if we have the old Suitcase folder | 513 | // check to see if we have the old Suitcase folder |
514 | folders = m_Database.GetFolders( | 514 | folders = m_Database.GetFolders( |
515 | new string[] { "agentID", "folderName", "parentFolderID" }, | 515 | new string[] { "agentID", "folderName", "parentFolderID" }, |
@@ -629,7 +629,7 @@ namespace OpenSim.Services.HypergridService | |||
629 | { | 629 | { |
630 | if (a.Wearables[i][j].ItemID == itemID) | 630 | if (a.Wearables[i][j].ItemID == itemID) |
631 | { | 631 | { |
632 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID); | 632 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID); |
633 | return true; | 633 | return true; |
634 | } | 634 | } |
635 | } | 635 | } |
@@ -638,7 +638,7 @@ namespace OpenSim.Services.HypergridService | |||
638 | // Check attachments | 638 | // Check attachments |
639 | if (a.GetAttachmentForItem(itemID) != null) | 639 | if (a.GetAttachmentForItem(itemID) != null) |
640 | { | 640 | { |
641 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID); | 641 | //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID); |
642 | return true; | 642 | return true; |
643 | } | 643 | } |
644 | 644 | ||
diff --git a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs index df4751e..31b9f4e 100644 --- a/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.HypergridService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.HypergridService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs index 25ffb63..ae0f7ce 100644 --- a/OpenSim/Services/HypergridService/UserAccountCache.cs +++ b/OpenSim/Services/HypergridService/UserAccountCache.cs | |||
@@ -16,7 +16,7 @@ namespace OpenSim.Services.HypergridService | |||
16 | // private static readonly ILog m_log = | 16 | // private static readonly ILog m_log = |
17 | // LogManager.GetLogger( | 17 | // LogManager.GetLogger( |
18 | // MethodBase.GetCurrentMethod().DeclaringType); | 18 | // MethodBase.GetCurrentMethod().DeclaringType); |
19 | 19 | ||
20 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; | 20 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; |
21 | 21 | ||
22 | private IUserAccountService m_UserAccountService; | 22 | private IUserAccountService m_UserAccountService; |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index e701ec6..ba3cb2f 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -219,7 +219,7 @@ namespace OpenSim.Services.HypergridService | |||
219 | 219 | ||
220 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason) | 220 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason) |
221 | { | 221 | { |
222 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", | 222 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", |
223 | agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI); | 223 | agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI); |
224 | 224 | ||
225 | string gridName = gatekeeper.ServerURI; | 225 | string gridName = gatekeeper.ServerURI; |
@@ -269,7 +269,7 @@ namespace OpenSim.Services.HypergridService | |||
269 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); | 269 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); |
270 | TravelingAgentInfo old = null; | 270 | TravelingAgentInfo old = null; |
271 | TravelingAgentInfo travel = CreateTravelInfo(agentCircuit, region, fromLogin, out old); | 271 | TravelingAgentInfo travel = CreateTravelInfo(agentCircuit, region, fromLogin, out old); |
272 | 272 | ||
273 | bool success = false; | 273 | bool success = false; |
274 | string myExternalIP = string.Empty; | 274 | string myExternalIP = string.Empty; |
275 | 275 | ||
@@ -288,7 +288,7 @@ namespace OpenSim.Services.HypergridService | |||
288 | 288 | ||
289 | if (!success) | 289 | if (!success) |
290 | { | 290 | { |
291 | m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", | 291 | m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", |
292 | agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); | 292 | agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); |
293 | 293 | ||
294 | if (old != null) | 294 | if (old != null) |
@@ -301,11 +301,11 @@ namespace OpenSim.Services.HypergridService | |||
301 | 301 | ||
302 | // Everything is ok | 302 | // Everything is ok |
303 | 303 | ||
304 | if (!fromLogin) | 304 | if (!fromLogin) |
305 | { | 305 | { |
306 | // Update the perceived IP Address of our grid | 306 | // Update the perceived IP Address of our grid |
307 | m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); | 307 | m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); |
308 | } | 308 | } |
309 | 309 | ||
310 | travel.MyIpAddress = myExternalIP; | 310 | travel.MyIpAddress = myExternalIP; |
311 | 311 | ||
@@ -376,7 +376,7 @@ namespace OpenSim.Services.HypergridService | |||
376 | if (m_BypassClientVerification) | 376 | if (m_BypassClientVerification) |
377 | return true; | 377 | return true; |
378 | 378 | ||
379 | m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with reported IP {1}.", | 379 | m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with reported IP {1}.", |
380 | sessionID, reportedIP); | 380 | sessionID, reportedIP); |
381 | 381 | ||
382 | HGTravelingData hgt = m_Database.Get(sessionID); | 382 | HGTravelingData hgt = m_Database.Get(sessionID); |
@@ -535,7 +535,7 @@ namespace OpenSim.Services.HypergridService | |||
535 | FriendInfo[] friendInfos = m_FriendsService.GetFriends(localUserID); | 535 | FriendInfo[] friendInfos = m_FriendsService.GetFriends(localUserID); |
536 | foreach (FriendInfo finfo in friendInfos) | 536 | foreach (FriendInfo finfo in friendInfos) |
537 | { | 537 | { |
538 | if (finfo.Friend.StartsWith(foreignUserID.ToString()) && finfo.Friend.EndsWith(secret) && | 538 | if (finfo.Friend.StartsWith(foreignUserID.ToString()) && finfo.Friend.EndsWith(secret) && |
539 | (finfo.TheirFlags & (int)FriendRights.CanSeeOnline) != 0 && (finfo.TheirFlags != -1)) | 539 | (finfo.TheirFlags & (int)FriendRights.CanSeeOnline) != 0 && (finfo.TheirFlags != -1)) |
540 | { | 540 | { |
541 | // great! | 541 | // great! |
@@ -641,7 +641,7 @@ namespace OpenSim.Services.HypergridService | |||
641 | foreach (FriendInfo f in friends) | 641 | foreach (FriendInfo f in friends) |
642 | if (f.Friend.StartsWith(targetUserID.ToString())) | 642 | if (f.Friend.StartsWith(targetUserID.ToString())) |
643 | { | 643 | { |
644 | // Let's remove the secret | 644 | // Let's remove the secret |
645 | UUID id; string tmp = string.Empty, secret = string.Empty; | 645 | UUID id; string tmp = string.Empty, secret = string.Empty; |
646 | if (Util.ParseUniversalUserIdentifier(f.Friend, out id, out tmp, out tmp, out tmp, out secret)) | 646 | if (Util.ParseUniversalUserIdentifier(f.Friend, out id, out tmp, out tmp, out tmp, out secret)) |
647 | return f.Friend.Replace(secret, "0"); | 647 | return f.Friend.Replace(secret, "0"); |
diff --git a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs index ae2c5ac..af92326 100644 --- a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs +++ b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs | |||
@@ -33,7 +33,7 @@ namespace OpenSim.Services.Interfaces | |||
33 | { | 33 | { |
34 | public class AgentPrefs | 34 | public class AgentPrefs |
35 | { | 35 | { |
36 | public AgentPrefs(UUID principalID) | 36 | public AgentPrefs(UUID principalID) |
37 | { | 37 | { |
38 | PrincipalID = principalID; | 38 | PrincipalID = principalID; |
39 | } | 39 | } |
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs index 28c3315..170dc97 100644 --- a/OpenSim/Services/Interfaces/IAssetService.cs +++ b/OpenSim/Services/Interfaces/IAssetService.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Services.Interfaces | |||
47 | /// <param name="id"></param> | 47 | /// <param name="id"></param> |
48 | /// <returns></returns> | 48 | /// <returns></returns> |
49 | AssetMetadata GetMetadata(string id); | 49 | AssetMetadata GetMetadata(string id); |
50 | 50 | ||
51 | /// <summary> | 51 | /// <summary> |
52 | /// Get an asset's data, ignoring the metadata. | 52 | /// Get an asset's data, ignoring the metadata. |
53 | /// </summary> | 53 | /// </summary> |
@@ -63,7 +63,7 @@ namespace OpenSim.Services.Interfaces | |||
63 | AssetBase GetCached(string id); | 63 | AssetBase GetCached(string id); |
64 | 64 | ||
65 | /// <summary> | 65 | /// <summary> |
66 | /// Get an asset synchronously or asynchronously (depending on whether | 66 | /// Get an asset synchronously or asynchronously (depending on whether |
67 | /// it is locally cached) and fire a callback with the fetched asset | 67 | /// it is locally cached) and fire a callback with the fetched asset |
68 | /// </summary> | 68 | /// </summary> |
69 | /// <param name="id">The asset id</param> | 69 | /// <param name="id">The asset id</param> |
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces | |||
75 | /// </param> | 75 | /// </param> |
76 | /// <returns>True if the id was parseable, false otherwise</returns> | 76 | /// <returns>True if the id was parseable, false otherwise</returns> |
77 | bool Get(string id, Object sender, AssetRetrieved handler); | 77 | bool Get(string id, Object sender, AssetRetrieved handler); |
78 | 78 | ||
79 | /// <summary> | 79 | /// <summary> |
80 | /// Check if assets exist in the database. | 80 | /// Check if assets exist in the database. |
81 | /// </summary> | 81 | /// </summary> |
diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs index cdcfad9..1ff092f 100644 --- a/OpenSim/Services/Interfaces/IAuthenticationService.cs +++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Interfaces | |||
55 | // Generic Authentication service used for identifying | 55 | // Generic Authentication service used for identifying |
56 | // and authenticating principals. | 56 | // and authenticating principals. |
57 | // Principals may be clients acting on users' behalf, | 57 | // Principals may be clients acting on users' behalf, |
58 | // or any other components that need | 58 | // or any other components that need |
59 | // verifiable identification. | 59 | // verifiable identification. |
60 | // | 60 | // |
61 | public interface IAuthenticationService | 61 | public interface IAuthenticationService |
diff --git a/OpenSim/Services/Interfaces/IAuthorizationService.cs b/OpenSim/Services/Interfaces/IAuthorizationService.cs index e5c68f6..d4c697a 100644 --- a/OpenSim/Services/Interfaces/IAuthorizationService.cs +++ b/OpenSim/Services/Interfaces/IAuthorizationService.cs | |||
@@ -31,7 +31,7 @@ using OpenSim.Framework; | |||
31 | namespace OpenSim.Services.Interfaces | 31 | namespace OpenSim.Services.Interfaces |
32 | { | 32 | { |
33 | // Generic Authorization service used for authorizing principals in a particular region | 33 | // Generic Authorization service used for authorizing principals in a particular region |
34 | 34 | ||
35 | public interface IAuthorizationService | 35 | public interface IAuthorizationService |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Interfaces | |||
50 | bool IsAuthorizedForRegion( | 50 | bool IsAuthorizedForRegion( |
51 | string userID, string firstName, string lastName, string regionID, out string message); | 51 | string userID, string firstName, string lastName, string regionID, out string message); |
52 | } | 52 | } |
53 | 53 | ||
54 | public class AuthorizationRequest | 54 | public class AuthorizationRequest |
55 | { | 55 | { |
56 | private string m_userID; | 56 | private string m_userID; |
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Interfaces | |||
69 | m_userID = ID; | 69 | m_userID = ID; |
70 | m_regionID = RegionID; | 70 | m_regionID = RegionID; |
71 | } | 71 | } |
72 | 72 | ||
73 | public AuthorizationRequest( | 73 | public AuthorizationRequest( |
74 | string ID, string FirstName, string SurName, string Email, string RegionName, string RegionID) | 74 | string ID, string FirstName, string SurName, string Email, string RegionName, string RegionID) |
75 | { | 75 | { |
@@ -80,44 +80,44 @@ namespace OpenSim.Services.Interfaces | |||
80 | m_regionName = RegionName; | 80 | m_regionName = RegionName; |
81 | m_regionID = RegionID; | 81 | m_regionID = RegionID; |
82 | } | 82 | } |
83 | 83 | ||
84 | public string ID | 84 | public string ID |
85 | { | 85 | { |
86 | get { return m_userID; } | 86 | get { return m_userID; } |
87 | set { m_userID = value; } | 87 | set { m_userID = value; } |
88 | } | 88 | } |
89 | 89 | ||
90 | public string FirstName | 90 | public string FirstName |
91 | { | 91 | { |
92 | get { return m_firstname; } | 92 | get { return m_firstname; } |
93 | set { m_firstname = value; } | 93 | set { m_firstname = value; } |
94 | } | 94 | } |
95 | 95 | ||
96 | public string SurName | 96 | public string SurName |
97 | { | 97 | { |
98 | get { return m_surname; } | 98 | get { return m_surname; } |
99 | set { m_surname = value; } | 99 | set { m_surname = value; } |
100 | } | 100 | } |
101 | 101 | ||
102 | public string Email | 102 | public string Email |
103 | { | 103 | { |
104 | get { return m_email; } | 104 | get { return m_email; } |
105 | set { m_email = value; } | 105 | set { m_email = value; } |
106 | } | 106 | } |
107 | 107 | ||
108 | public string RegionName | 108 | public string RegionName |
109 | { | 109 | { |
110 | get { return m_regionName; } | 110 | get { return m_regionName; } |
111 | set { m_regionName = value; } | 111 | set { m_regionName = value; } |
112 | } | 112 | } |
113 | 113 | ||
114 | public string RegionID | 114 | public string RegionID |
115 | { | 115 | { |
116 | get { return m_regionID; } | 116 | get { return m_regionID; } |
117 | set { m_regionID = value; } | 117 | set { m_regionID = value; } |
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | public class AuthorizationResponse | 121 | public class AuthorizationResponse |
122 | { | 122 | { |
123 | private bool m_isAuthorized; | 123 | private bool m_isAuthorized; |
@@ -132,13 +132,13 @@ namespace OpenSim.Services.Interfaces | |||
132 | m_isAuthorized = isAuthorized; | 132 | m_isAuthorized = isAuthorized; |
133 | m_message = message; | 133 | m_message = message; |
134 | } | 134 | } |
135 | 135 | ||
136 | public bool IsAuthorized | 136 | public bool IsAuthorized |
137 | { | 137 | { |
138 | get { return m_isAuthorized; } | 138 | get { return m_isAuthorized; } |
139 | set { m_isAuthorized = value; } | 139 | set { m_isAuthorized = value; } |
140 | } | 140 | } |
141 | 141 | ||
142 | public string Message | 142 | public string Message |
143 | { | 143 | { |
144 | get { return m_message; } | 144 | get { return m_message; } |
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs index 99b71b9..b4dc511 100644 --- a/OpenSim/Services/Interfaces/IAvatarService.cs +++ b/OpenSim/Services/Interfaces/IAvatarService.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Services.Interfaces | |||
51 | /// <param name="appearance"></param> | 51 | /// <param name="appearance"></param> |
52 | /// <returns></returns> | 52 | /// <returns></returns> |
53 | bool SetAppearance(UUID userID, AvatarAppearance appearance); | 53 | bool SetAppearance(UUID userID, AvatarAppearance appearance); |
54 | 54 | ||
55 | /// <summary> | 55 | /// <summary> |
56 | /// Called by the login service | 56 | /// Called by the login service |
57 | /// </summary> | 57 | /// </summary> |
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces | |||
75 | bool ResetAvatar(UUID userID); | 75 | bool ResetAvatar(UUID userID); |
76 | 76 | ||
77 | /// <summary> | 77 | /// <summary> |
78 | /// These methods raison d'etre: | 78 | /// These methods raison d'etre: |
79 | /// No need to send the entire avatar data (SetAvatar) for changing attachments | 79 | /// No need to send the entire avatar data (SetAvatar) for changing attachments |
80 | /// </summary> | 80 | /// </summary> |
81 | /// <param name="userID"></param> | 81 | /// <param name="userID"></param> |
@@ -291,8 +291,8 @@ namespace OpenSim.Services.Interfaces | |||
291 | byte[] binary = new byte[vps.Length]; | 291 | byte[] binary = new byte[vps.Length]; |
292 | 292 | ||
293 | for (int i = 0; i < vps.Length; i++) | 293 | for (int i = 0; i < vps.Length; i++) |
294 | binary[i] = (byte)Convert.ToInt32(vps[i]); | 294 | binary[i] = (byte)Convert.ToInt32(vps[i]); |
295 | 295 | ||
296 | appearance.VisualParams = binary; | 296 | appearance.VisualParams = binary; |
297 | } | 297 | } |
298 | 298 | ||
diff --git a/OpenSim/Services/Interfaces/IEstateDataService.cs b/OpenSim/Services/Interfaces/IEstateDataService.cs index 719563d..9b64a39 100644 --- a/OpenSim/Services/Interfaces/IEstateDataService.cs +++ b/OpenSim/Services/Interfaces/IEstateDataService.cs | |||
@@ -39,14 +39,14 @@ namespace OpenSim.Services.Interfaces | |||
39 | /// </summary> | 39 | /// </summary> |
40 | /// <param name="regionID"></param> | 40 | /// <param name="regionID"></param> |
41 | /// <param name="create">If true, then an estate is created if one is not found.</param> | 41 | /// <param name="create">If true, then an estate is created if one is not found.</param> |
42 | /// <returns></returns> | 42 | /// <returns></returns> |
43 | EstateSettings LoadEstateSettings(UUID regionID, bool create); | 43 | EstateSettings LoadEstateSettings(UUID regionID, bool create); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Load estate settings for an estate ID. | 46 | /// Load estate settings for an estate ID. |
47 | /// </summary> | 47 | /// </summary> |
48 | /// <param name="estateID"></param> | 48 | /// <param name="estateID"></param> |
49 | /// <returns></returns> | 49 | /// <returns></returns> |
50 | EstateSettings LoadEstateSettings(int estateID); | 50 | EstateSettings LoadEstateSettings(int estateID); |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
@@ -56,60 +56,60 @@ namespace OpenSim.Services.Interfaces | |||
56 | /// A <see cref="EstateSettings"/> | 56 | /// A <see cref="EstateSettings"/> |
57 | /// </returns> | 57 | /// </returns> |
58 | EstateSettings CreateNewEstate(); | 58 | EstateSettings CreateNewEstate(); |
59 | 59 | ||
60 | /// <summary> | 60 | /// <summary> |
61 | /// Load/Get all estate settings. | 61 | /// Load/Get all estate settings. |
62 | /// </summary> | 62 | /// </summary> |
63 | /// <returns>An empty list if no estates were found.</returns> | 63 | /// <returns>An empty list if no estates were found.</returns> |
64 | List<EstateSettings> LoadEstateSettingsAll(); | 64 | List<EstateSettings> LoadEstateSettingsAll(); |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
67 | /// Store estate settings. | 67 | /// Store estate settings. |
68 | /// </summary> | 68 | /// </summary> |
69 | /// <remarks> | 69 | /// <remarks> |
70 | /// This is also called by EstateSettings.Save()</remarks> | 70 | /// This is also called by EstateSettings.Save()</remarks> |
71 | /// <param name="es"></param> | 71 | /// <param name="es"></param> |
72 | void StoreEstateSettings(EstateSettings es); | 72 | void StoreEstateSettings(EstateSettings es); |
73 | 73 | ||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Get estate IDs. | 75 | /// Get estate IDs. |
76 | /// </summary> | 76 | /// </summary> |
77 | /// <param name="search">Name of estate to search for. This is the exact name, no parttern matching is done.</param> | 77 | /// <param name="search">Name of estate to search for. This is the exact name, no parttern matching is done.</param> |
78 | /// <returns></returns> | 78 | /// <returns></returns> |
79 | List<int> GetEstates(string search); | 79 | List<int> GetEstates(string search); |
80 | 80 | ||
81 | /// <summary> | 81 | /// <summary> |
82 | /// Get the IDs of all estates owned by the given user. | 82 | /// Get the IDs of all estates owned by the given user. |
83 | /// </summary> | 83 | /// </summary> |
84 | /// <returns>An empty list if no estates were found.</returns> | 84 | /// <returns>An empty list if no estates were found.</returns> |
85 | List<int> GetEstatesByOwner(UUID ownerID); | 85 | List<int> GetEstatesByOwner(UUID ownerID); |
86 | 86 | ||
87 | /// <summary> | 87 | /// <summary> |
88 | /// Get the IDs of all estates. | 88 | /// Get the IDs of all estates. |
89 | /// </summary> | 89 | /// </summary> |
90 | /// <returns>An empty list if no estates were found.</returns> | 90 | /// <returns>An empty list if no estates were found.</returns> |
91 | List<int> GetEstatesAll(); | 91 | List<int> GetEstatesAll(); |
92 | 92 | ||
93 | /// <summary> | 93 | /// <summary> |
94 | /// Link a region to an estate. | 94 | /// Link a region to an estate. |
95 | /// </summary> | 95 | /// </summary> |
96 | /// <param name="regionID"></param> | 96 | /// <param name="regionID"></param> |
97 | /// <param name="estateID"></param> | 97 | /// <param name="estateID"></param> |
98 | /// <returns>true if the link succeeded, false otherwise</returns> | 98 | /// <returns>true if the link succeeded, false otherwise</returns> |
99 | bool LinkRegion(UUID regionID, int estateID); | 99 | bool LinkRegion(UUID regionID, int estateID); |
100 | 100 | ||
101 | /// <summary> | 101 | /// <summary> |
102 | /// Get the UUIDs of all the regions in an estate. | 102 | /// Get the UUIDs of all the regions in an estate. |
103 | /// </summary> | 103 | /// </summary> |
104 | /// <param name="estateID"></param> | 104 | /// <param name="estateID"></param> |
105 | /// <returns></returns> | 105 | /// <returns></returns> |
106 | List<UUID> GetRegions(int estateID); | 106 | List<UUID> GetRegions(int estateID); |
107 | 107 | ||
108 | /// <summary> | 108 | /// <summary> |
109 | /// Delete an estate | 109 | /// Delete an estate |
110 | /// </summary> | 110 | /// </summary> |
111 | /// <param name="estateID"></param> | 111 | /// <param name="estateID"></param> |
112 | /// <returns>true if the delete succeeded, false otherwise</returns> | 112 | /// <returns>true if the delete succeeded, false otherwise</returns> |
113 | bool DeleteEstate(int estateID); | 113 | bool DeleteEstate(int estateID); |
114 | } | 114 | } |
115 | } \ No newline at end of file | 115 | } \ No newline at end of file |
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 63c6e5f..66e5870 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Services.Interfaces | |||
85 | GridRegion GetRegionByName(UUID scopeID, string regionName); | 85 | GridRegion GetRegionByName(UUID scopeID, string regionName); |
86 | 86 | ||
87 | /// <summary> | 87 | /// <summary> |
88 | /// Get information about regions starting with the provided name. | 88 | /// Get information about regions starting with the provided name. |
89 | /// </summary> | 89 | /// </summary> |
90 | /// <param name="name"> | 90 | /// <param name="name"> |
91 | /// The name to match against. | 91 | /// The name to match against. |
@@ -95,7 +95,7 @@ namespace OpenSim.Services.Interfaces | |||
95 | /// </param> | 95 | /// </param> |
96 | /// <returns> | 96 | /// <returns> |
97 | /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the | 97 | /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the |
98 | /// grid-server couldn't be contacted or returned an error, return null. | 98 | /// grid-server couldn't be contacted or returned an error, return null. |
99 | /// </returns> | 99 | /// </returns> |
100 | List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber); | 100 | List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber); |
101 | 101 | ||
@@ -139,7 +139,7 @@ namespace OpenSim.Services.Interfaces | |||
139 | #pragma warning restore 414 | 139 | #pragma warning restore 414 |
140 | 140 | ||
141 | /// <summary> | 141 | /// <summary> |
142 | /// The port by which http communication occurs with the region | 142 | /// The port by which http communication occurs with the region |
143 | /// </summary> | 143 | /// </summary> |
144 | public uint HttpPort { get; set; } | 144 | public uint HttpPort { get; set; } |
145 | 145 | ||
@@ -148,7 +148,7 @@ namespace OpenSim.Services.Interfaces | |||
148 | /// </summary> | 148 | /// </summary> |
149 | public string ServerURI | 149 | public string ServerURI |
150 | { | 150 | { |
151 | get { | 151 | get { |
152 | if (!String.IsNullOrEmpty(m_serverURI)) { | 152 | if (!String.IsNullOrEmpty(m_serverURI)) { |
153 | return m_serverURI; | 153 | return m_serverURI; |
154 | } else { | 154 | } else { |
@@ -158,7 +158,7 @@ namespace OpenSim.Services.Interfaces | |||
158 | return "http://" + m_externalHostName + ":" + HttpPort + "/"; | 158 | return "http://" + m_externalHostName + ":" + HttpPort + "/"; |
159 | } | 159 | } |
160 | } | 160 | } |
161 | set { | 161 | set { |
162 | if ( value == null) | 162 | if ( value == null) |
163 | { | 163 | { |
164 | m_serverURI = String.Empty; | 164 | m_serverURI = String.Empty; |
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Interfaces | |||
344 | RegionSecret = ConvertFrom.RegionSecret; | 344 | RegionSecret = ConvertFrom.RegionSecret; |
345 | EstateOwner = ConvertFrom.EstateOwner; | 345 | EstateOwner = ConvertFrom.EstateOwner; |
346 | } | 346 | } |
347 | 347 | ||
348 | public GridRegion(Dictionary<string, object> kvp) | 348 | public GridRegion(Dictionary<string, object> kvp) |
349 | { | 349 | { |
350 | if (kvp.ContainsKey("uuid")) | 350 | if (kvp.ContainsKey("uuid")) |
@@ -424,7 +424,7 @@ namespace OpenSim.Services.Interfaces | |||
424 | // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>", | 424 | // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>", |
425 | // LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY); | 425 | // LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY); |
426 | } | 426 | } |
427 | 427 | ||
428 | public Dictionary<string, object> ToKeyValuePairs() | 428 | public Dictionary<string, object> ToKeyValuePairs() |
429 | { | 429 | { |
430 | Dictionary<string, object> kvp = new Dictionary<string, object>(); | 430 | Dictionary<string, object> kvp = new Dictionary<string, object>(); |
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs index 2e7237e..6ad0f42 100644 --- a/OpenSim/Services/Interfaces/IGridUserService.cs +++ b/OpenSim/Services/Interfaces/IGridUserService.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Services.Interfaces | |||
37 | public class GridUserInfo | 37 | public class GridUserInfo |
38 | { | 38 | { |
39 | public string UserID; | 39 | public string UserID; |
40 | 40 | ||
41 | public UUID HomeRegionID; | 41 | public UUID HomeRegionID; |
42 | public Vector3 HomePosition; | 42 | public Vector3 HomePosition; |
43 | public Vector3 HomeLookAt; | 43 | public Vector3 HomeLookAt; |
@@ -45,13 +45,13 @@ namespace OpenSim.Services.Interfaces | |||
45 | public UUID LastRegionID; | 45 | public UUID LastRegionID; |
46 | public Vector3 LastPosition; | 46 | public Vector3 LastPosition; |
47 | public Vector3 LastLookAt; | 47 | public Vector3 LastLookAt; |
48 | 48 | ||
49 | public bool Online; | 49 | public bool Online; |
50 | public DateTime Login; | 50 | public DateTime Login; |
51 | public DateTime Logout; | 51 | public DateTime Logout; |
52 | 52 | ||
53 | public GridUserInfo() {} | 53 | public GridUserInfo() {} |
54 | 54 | ||
55 | public GridUserInfo(Dictionary<string, object> kvp) | 55 | public GridUserInfo(Dictionary<string, object> kvp) |
56 | { | 56 | { |
57 | if (kvp.ContainsKey("UserID")) | 57 | if (kvp.ContainsKey("UserID")) |
@@ -96,11 +96,11 @@ namespace OpenSim.Services.Interfaces | |||
96 | result["Online"] = Online.ToString(); | 96 | result["Online"] = Online.ToString(); |
97 | result["Login"] = Login.ToString(); | 97 | result["Login"] = Login.ToString(); |
98 | result["Logout"] = Logout.ToString(); | 98 | result["Logout"] = Logout.ToString(); |
99 | 99 | ||
100 | return result; | 100 | return result; |
101 | } | 101 | } |
102 | } | 102 | } |
103 | 103 | ||
104 | public interface IGridUserService | 104 | public interface IGridUserService |
105 | { | 105 | { |
106 | GridUserInfo LoggedIn(string userID); | 106 | GridUserInfo LoggedIn(string userID); |
@@ -115,7 +115,7 @@ namespace OpenSim.Services.Interfaces | |||
115 | /// <param name="lastLookAt">Last normalized look direction for the user</param> | 115 | /// <param name="lastLookAt">Last normalized look direction for the user</param> |
116 | /// <returns>True if the logout request was successfully processed, otherwise false</returns> | 116 | /// <returns>True if the logout request was successfully processed, otherwise false</returns> |
117 | bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); | 117 | bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); |
118 | 118 | ||
119 | bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt); | 119 | bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt); |
120 | 120 | ||
121 | /// <summary> | 121 | /// <summary> |
@@ -128,7 +128,7 @@ namespace OpenSim.Services.Interfaces | |||
128 | /// <param name="lastLookAt">Normalized look direction</param> | 128 | /// <param name="lastLookAt">Normalized look direction</param> |
129 | /// <returns>True if the user's last position was successfully updated, otherwise false</returns> | 129 | /// <returns>True if the user's last position was successfully updated, otherwise false</returns> |
130 | bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); | 130 | bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); |
131 | 131 | ||
132 | GridUserInfo GetGridUserInfo(string userID); | 132 | GridUserInfo GetGridUserInfo(string userID); |
133 | GridUserInfo[] GetGridUserInfo(string[] userID); | 133 | GridUserInfo[] GetGridUserInfo(string[] userID); |
134 | } | 134 | } |
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs index 1815e6c..e0a63ca 100644 --- a/OpenSim/Services/Interfaces/IHypergridServices.cs +++ b/OpenSim/Services/Interfaces/IHypergridServices.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Services.Interfaces | |||
37 | public interface IGatekeeperService | 37 | public interface IGatekeeperService |
38 | { | 38 | { |
39 | bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason, out int sizeX, out int sizeY); | 39 | bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason, out int sizeX, out int sizeY); |
40 | 40 | ||
41 | /// <summary> | 41 | /// <summary> |
42 | /// Returns the region a Hypergrid visitor should enter. | 42 | /// Returns the region a Hypergrid visitor should enter. |
43 | /// </summary> | 43 | /// </summary> |
@@ -59,7 +59,7 @@ namespace OpenSim.Services.Interfaces | |||
59 | public interface IUserAgentService | 59 | public interface IUserAgentService |
60 | { | 60 | { |
61 | bool LoginAgentToGrid(GridRegion source, AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason); | 61 | bool LoginAgentToGrid(GridRegion source, AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason); |
62 | 62 | ||
63 | void LogoutAgent(UUID userID, UUID sessionID); | 63 | void LogoutAgent(UUID userID, UUID sessionID); |
64 | 64 | ||
65 | /// <summary> | 65 | /// <summary> |
@@ -89,7 +89,7 @@ namespace OpenSim.Services.Interfaces | |||
89 | /// <returns>On success: the user's Server URLs. If the user doesn't exist: "".</returns> | 89 | /// <returns>On success: the user's Server URLs. If the user doesn't exist: "".</returns> |
90 | /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks> | 90 | /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks> |
91 | string LocateUser(UUID userID); | 91 | string LocateUser(UUID userID); |
92 | 92 | ||
93 | /// <summary> | 93 | /// <summary> |
94 | /// Returns the Universal User Identifier for 'targetUserID' on behalf of 'userID'. | 94 | /// Returns the Universal User Identifier for 'targetUserID' on behalf of 'userID'. |
95 | /// </summary> | 95 | /// </summary> |
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs index c0c9ba8..582ea90 100644 --- a/OpenSim/Services/Interfaces/IInventoryService.cs +++ b/OpenSim/Services/Interfaces/IInventoryService.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Services.Interfaces | |||
84 | /// <param name="folderIDs"></param> | 84 | /// <param name="folderIDs"></param> |
85 | /// <returns>Inventory content.</returns> | 85 | /// <returns>Inventory content.</returns> |
86 | InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs); | 86 | InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs); |
87 | 87 | ||
88 | /// <summary> | 88 | /// <summary> |
89 | /// Gets the items inside a folder | 89 | /// Gets the items inside a folder |
90 | /// </summary> | 90 | /// </summary> |
@@ -193,11 +193,11 @@ namespace OpenSim.Services.Interfaces | |||
193 | 193 | ||
194 | /// <summary> | 194 | /// <summary> |
195 | /// Get the union of permissions of all inventory items | 195 | /// Get the union of permissions of all inventory items |
196 | /// that hold the given assetID. | 196 | /// that hold the given assetID. |
197 | /// </summary> | 197 | /// </summary> |
198 | /// <param name="userID"></param> | 198 | /// <param name="userID"></param> |
199 | /// <param name="assetID"></param> | 199 | /// <param name="assetID"></param> |
200 | /// <returns>The permissions or 0 if no such asset is found in | 200 | /// <returns>The permissions or 0 if no such asset is found in |
201 | /// the user's inventory</returns> | 201 | /// the user's inventory</returns> |
202 | int GetAssetPermissions(UUID userID, UUID assetID); | 202 | int GetAssetPermissions(UUID userID, UUID assetID); |
203 | } | 203 | } |
diff --git a/OpenSim/Services/Interfaces/IOfflineIMService.cs b/OpenSim/Services/Interfaces/IOfflineIMService.cs index 588aaaf..db501fd 100644 --- a/OpenSim/Services/Interfaces/IOfflineIMService.cs +++ b/OpenSim/Services/Interfaces/IOfflineIMService.cs | |||
@@ -35,9 +35,9 @@ namespace OpenSim.Services.Interfaces | |||
35 | public interface IOfflineIMService | 35 | public interface IOfflineIMService |
36 | { | 36 | { |
37 | List<GridInstantMessage> GetMessages(UUID principalID); | 37 | List<GridInstantMessage> GetMessages(UUID principalID); |
38 | 38 | ||
39 | bool StoreMessage(GridInstantMessage im, out string reason); | 39 | bool StoreMessage(GridInstantMessage im, out string reason); |
40 | 40 | ||
41 | /// <summary> | 41 | /// <summary> |
42 | /// Delete messages to or from this user (or group). | 42 | /// Delete messages to or from this user (or group). |
43 | /// </summary> | 43 | /// </summary> |
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index d89f6ff..a01897a 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Services.Interfaces | |||
59 | /// <param name="destination"></param> | 59 | /// <param name="destination"></param> |
60 | /// <param name="aCircuit"></param> | 60 | /// <param name="aCircuit"></param> |
61 | /// <param name="flags"></param> | 61 | /// <param name="flags"></param> |
62 | /// <param name="reason">Reason message in the event of a failure.</param> | 62 | /// <param name="reason">Reason message in the event of a failure.</param> |
63 | bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason); | 63 | bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason); |
64 | 64 | ||
65 | /// <summary> | 65 | /// <summary> |
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs index 121baa8..867c623 100644 --- a/OpenSim/Services/Interfaces/IUserProfilesService.cs +++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs | |||
@@ -40,19 +40,19 @@ namespace OpenSim.Services.Interfaces | |||
40 | bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result); | 40 | bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result); |
41 | bool ClassifiedDelete(UUID recordId); | 41 | bool ClassifiedDelete(UUID recordId); |
42 | #endregion Classifieds | 42 | #endregion Classifieds |
43 | 43 | ||
44 | #region Picks | 44 | #region Picks |
45 | OSD AvatarPicksRequest(UUID creatorId); | 45 | OSD AvatarPicksRequest(UUID creatorId); |
46 | bool PickInfoRequest(ref UserProfilePick pick, ref string result); | 46 | bool PickInfoRequest(ref UserProfilePick pick, ref string result); |
47 | bool PicksUpdate(ref UserProfilePick pick, ref string result); | 47 | bool PicksUpdate(ref UserProfilePick pick, ref string result); |
48 | bool PicksDelete(UUID pickId); | 48 | bool PicksDelete(UUID pickId); |
49 | #endregion Picks | 49 | #endregion Picks |
50 | 50 | ||
51 | #region Notes | 51 | #region Notes |
52 | bool AvatarNotesRequest(ref UserProfileNotes note); | 52 | bool AvatarNotesRequest(ref UserProfileNotes note); |
53 | bool NotesUpdate(ref UserProfileNotes note, ref string result); | 53 | bool NotesUpdate(ref UserProfileNotes note, ref string result); |
54 | #endregion Notes | 54 | #endregion Notes |
55 | 55 | ||
56 | #region Profile Properties | 56 | #region Profile Properties |
57 | bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result); | 57 | bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result); |
58 | bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result); | 58 | bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result); |
@@ -62,7 +62,7 @@ namespace OpenSim.Services.Interfaces | |||
62 | bool UserPreferencesRequest(ref UserPreferences pref, ref string result); | 62 | bool UserPreferencesRequest(ref UserPreferences pref, ref string result); |
63 | bool UserPreferencesUpdate(ref UserPreferences pref, ref string result); | 63 | bool UserPreferencesUpdate(ref UserPreferences pref, ref string result); |
64 | #endregion User Preferences | 64 | #endregion User Preferences |
65 | 65 | ||
66 | #region Interests | 66 | #region Interests |
67 | bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result); | 67 | bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result); |
68 | #endregion Interests | 68 | #endregion Interests |
diff --git a/OpenSim/Services/Interfaces/OpenProfileClient.cs b/OpenSim/Services/Interfaces/OpenProfileClient.cs index bda8151..8c4d14b 100644 --- a/OpenSim/Services/Interfaces/OpenProfileClient.cs +++ b/OpenSim/Services/Interfaces/OpenProfileClient.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Services.UserProfilesService | |||
49 | public class OpenProfileClient | 49 | public class OpenProfileClient |
50 | { | 50 | { |
51 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | private string m_serverURI; | 53 | private string m_serverURI; |
54 | 54 | ||
55 | /// <summary> | 55 | /// <summary> |
@@ -60,7 +60,7 @@ namespace OpenSim.Services.UserProfilesService | |||
60 | { | 60 | { |
61 | m_serverURI = serverURI; | 61 | m_serverURI = serverURI; |
62 | } | 62 | } |
63 | 63 | ||
64 | /// <summary> | 64 | /// <summary> |
65 | /// Gets an avatar's profile using the OpenProfile protocol. | 65 | /// Gets an avatar's profile using the OpenProfile protocol. |
66 | /// </summary> | 66 | /// </summary> |
diff --git a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs index 115afa2..6c683b4 100644 --- a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.Interfaces")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.Interfaces")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs index 7295103..2e3fb3e 100644 --- a/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.InventoryService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.InventoryService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs b/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs index 3cfd125..2e4637c 100644 --- a/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs +++ b/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Services.InventoryService.Tests | |||
47 | { | 47 | { |
48 | private IInventoryService CreateXInventoryService() | 48 | private IInventoryService CreateXInventoryService() |
49 | { | 49 | { |
50 | IConfigSource config = new IniConfigSource(); | 50 | IConfigSource config = new IniConfigSource(); |
51 | config.AddConfig("InventoryService"); | 51 | config.AddConfig("InventoryService"); |
52 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 52 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
53 | 53 | ||
@@ -73,19 +73,19 @@ namespace OpenSim.Services.InventoryService.Tests | |||
73 | UUID folderId = TestHelpers.ParseTail(0x30); | 73 | UUID folderId = TestHelpers.ParseTail(0x30); |
74 | int invType = (int)InventoryType.Animation; | 74 | int invType = (int)InventoryType.Animation; |
75 | int assetType = (int)AssetType.Animation; | 75 | int assetType = (int)AssetType.Animation; |
76 | string itemName = "item1"; | 76 | string itemName = "item1"; |
77 | 77 | ||
78 | IInventoryService xis = CreateXInventoryService(); | 78 | IInventoryService xis = CreateXInventoryService(); |
79 | 79 | ||
80 | InventoryItemBase itemToStore | 80 | InventoryItemBase itemToStore |
81 | = new InventoryItemBase(itemId, ownerId) | 81 | = new InventoryItemBase(itemId, ownerId) |
82 | { | 82 | { |
83 | CreatorIdentification = creatorId.ToString(), | 83 | CreatorIdentification = creatorId.ToString(), |
84 | AssetID = assetId, | 84 | AssetID = assetId, |
85 | Name = itemName, | 85 | Name = itemName, |
86 | Folder = folderId, | 86 | Folder = folderId, |
87 | InvType = invType, | 87 | InvType = invType, |
88 | AssetType = assetType | 88 | AssetType = assetType |
89 | }; | 89 | }; |
90 | 90 | ||
91 | Assert.That(xis.AddItem(itemToStore), Is.True); | 91 | Assert.That(xis.AddItem(itemToStore), Is.True); |
@@ -115,20 +115,20 @@ namespace OpenSim.Services.InventoryService.Tests | |||
115 | UUID folderId = TestHelpers.ParseTail(0x30); | 115 | UUID folderId = TestHelpers.ParseTail(0x30); |
116 | int invType = (int)InventoryType.Animation; | 116 | int invType = (int)InventoryType.Animation; |
117 | int assetType = (int)AssetType.Animation; | 117 | int assetType = (int)AssetType.Animation; |
118 | string itemName = "item1"; | 118 | string itemName = "item1"; |
119 | string itemName2 = "item2"; | 119 | string itemName2 = "item2"; |
120 | 120 | ||
121 | IInventoryService xis = CreateXInventoryService(); | 121 | IInventoryService xis = CreateXInventoryService(); |
122 | 122 | ||
123 | InventoryItemBase itemToStore | 123 | InventoryItemBase itemToStore |
124 | = new InventoryItemBase(itemId, ownerId) | 124 | = new InventoryItemBase(itemId, ownerId) |
125 | { | 125 | { |
126 | CreatorIdentification = creatorId.ToString(), | 126 | CreatorIdentification = creatorId.ToString(), |
127 | AssetID = assetId, | 127 | AssetID = assetId, |
128 | Name = itemName, | 128 | Name = itemName, |
129 | Folder = folderId, | 129 | Folder = folderId, |
130 | InvType = invType, | 130 | InvType = invType, |
131 | AssetType = assetType | 131 | AssetType = assetType |
132 | }; | 132 | }; |
133 | 133 | ||
134 | Assert.That(xis.AddItem(itemToStore), Is.True); | 134 | Assert.That(xis.AddItem(itemToStore), Is.True); |
@@ -149,7 +149,7 @@ namespace OpenSim.Services.InventoryService.Tests | |||
149 | UUID folderId2 = TestHelpers.ParseTail(0x70); | 149 | UUID folderId2 = TestHelpers.ParseTail(0x70); |
150 | int invType2 = (int)InventoryType.CallingCard; | 150 | int invType2 = (int)InventoryType.CallingCard; |
151 | int assetType2 = (int)AssetType.CallingCard; | 151 | int assetType2 = (int)AssetType.CallingCard; |
152 | string itemName3 = "item3"; | 152 | string itemName3 = "item3"; |
153 | 153 | ||
154 | itemToStore.CreatorIdentification = creatorId2.ToString(); | 154 | itemToStore.CreatorIdentification = creatorId2.ToString(); |
155 | itemToStore.Owner = ownerId2; | 155 | itemToStore.Owner = ownerId2; |
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 004c4bf..b8ed46c 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -176,7 +176,7 @@ namespace OpenSim.Services.InventoryService | |||
176 | protected virtual XInventoryFolder[] GetSystemFolders(UUID principalID, UUID rootID) | 176 | protected virtual XInventoryFolder[] GetSystemFolders(UUID principalID, UUID rootID) |
177 | { | 177 | { |
178 | // m_log.DebugFormat("[XINVENTORY SERVICE]: Getting system folders for {0}", principalID); | 178 | // m_log.DebugFormat("[XINVENTORY SERVICE]: Getting system folders for {0}", principalID); |
179 | 179 | ||
180 | XInventoryFolder[] allFolders = m_Database.GetFolders( | 180 | XInventoryFolder[] allFolders = m_Database.GetFolders( |
181 | new string[] { "agentID", "parentFolderID" }, | 181 | new string[] { "agentID", "parentFolderID" }, |
182 | new string[] { principalID.ToString(), rootID.ToString() }); | 182 | new string[] { principalID.ToString(), rootID.ToString() }); |
@@ -192,7 +192,7 @@ namespace OpenSim.Services.InventoryService | |||
192 | 192 | ||
193 | // m_log.DebugFormat( | 193 | // m_log.DebugFormat( |
194 | // "[XINVENTORY SERVICE]: Found {0} system folders for {1}", sysFolders.Length, principalID); | 194 | // "[XINVENTORY SERVICE]: Found {0} system folders for {1}", sysFolders.Length, principalID); |
195 | 195 | ||
196 | return sysFolders; | 196 | return sysFolders; |
197 | } | 197 | } |
198 | 198 | ||
@@ -234,7 +234,7 @@ namespace OpenSim.Services.InventoryService | |||
234 | break; | 234 | break; |
235 | } | 235 | } |
236 | } | 236 | } |
237 | 237 | ||
238 | if (root == null) // oops | 238 | if (root == null) // oops |
239 | root = folders[0]; | 239 | root = folders[0]; |
240 | 240 | ||
@@ -255,7 +255,7 @@ namespace OpenSim.Services.InventoryService | |||
255 | 255 | ||
256 | return null; | 256 | return null; |
257 | } | 257 | } |
258 | 258 | ||
259 | return GetSystemFolderForType(rootFolder, type); | 259 | return GetSystemFolderForType(rootFolder, type); |
260 | } | 260 | } |
261 | 261 | ||
@@ -335,11 +335,11 @@ namespace OpenSim.Services.InventoryService | |||
335 | 335 | ||
336 | return multiple; | 336 | return multiple; |
337 | } | 337 | } |
338 | 338 | ||
339 | public virtual List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) | 339 | public virtual List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) |
340 | { | 340 | { |
341 | // m_log.DebugFormat("[XINVENTORY]: Fetch items for folder {0}", folderID); | 341 | // m_log.DebugFormat("[XINVENTORY]: Fetch items for folder {0}", folderID); |
342 | 342 | ||
343 | // Since we probably don't get a valid principal here, either ... | 343 | // Since we probably don't get a valid principal here, either ... |
344 | // | 344 | // |
345 | List<InventoryItemBase> invItems = new List<InventoryItemBase>(); | 345 | List<InventoryItemBase> invItems = new List<InventoryItemBase>(); |
@@ -386,7 +386,7 @@ namespace OpenSim.Services.InventoryService | |||
386 | m_log.WarnFormat( | 386 | m_log.WarnFormat( |
387 | "[XINVENTORY]: System folder of type {0} already exists when tried to add {1} to {2} for {3}", | 387 | "[XINVENTORY]: System folder of type {0} already exists when tried to add {1} to {2} for {3}", |
388 | folder.Type, folder.Name, folder.ParentID, folder.Owner); | 388 | folder.Type, folder.Name, folder.ParentID, folder.Owner); |
389 | 389 | ||
390 | return false; | 390 | return false; |
391 | } | 391 | } |
392 | } | 392 | } |
@@ -498,7 +498,7 @@ namespace OpenSim.Services.InventoryService | |||
498 | { | 498 | { |
499 | // m_log.DebugFormat( | 499 | // m_log.DebugFormat( |
500 | // "[XINVENTORY SERVICE]: Adding item {0} {1} to folder {2} for {3}", item.Name, item.ID, item.Folder, item.Owner); | 500 | // "[XINVENTORY SERVICE]: Adding item {0} {1} to folder {2} for {3}", item.Name, item.ID, item.Folder, item.Owner); |
501 | 501 | ||
502 | return m_Database.StoreItem(ConvertFromOpenSim(item)); | 502 | return m_Database.StoreItem(ConvertFromOpenSim(item)); |
503 | } | 503 | } |
504 | 504 | ||
@@ -516,27 +516,27 @@ namespace OpenSim.Services.InventoryService | |||
516 | if (retrievedItem == null) | 516 | if (retrievedItem == null) |
517 | { | 517 | { |
518 | m_log.WarnFormat( | 518 | m_log.WarnFormat( |
519 | "[XINVENTORY SERVICE]: Tried to update item {0} {1}, owner {2} but no existing item found.", | 519 | "[XINVENTORY SERVICE]: Tried to update item {0} {1}, owner {2} but no existing item found.", |
520 | item.Name, item.ID, item.Owner); | 520 | item.Name, item.ID, item.Owner); |
521 | 521 | ||
522 | return false; | 522 | return false; |
523 | } | 523 | } |
524 | 524 | ||
525 | // Do not allow invariants to change. Changes to folder ID occur in MoveItems() | 525 | // Do not allow invariants to change. Changes to folder ID occur in MoveItems() |
526 | if (retrievedItem.InvType != item.InvType | 526 | if (retrievedItem.InvType != item.InvType |
527 | || retrievedItem.AssetType != item.AssetType | 527 | || retrievedItem.AssetType != item.AssetType |
528 | || retrievedItem.Folder != item.Folder | 528 | || retrievedItem.Folder != item.Folder |
529 | || retrievedItem.CreatorIdentification != item.CreatorIdentification | 529 | || retrievedItem.CreatorIdentification != item.CreatorIdentification |
530 | || retrievedItem.Owner != item.Owner) | 530 | || retrievedItem.Owner != item.Owner) |
531 | { | 531 | { |
532 | m_log.WarnFormat( | 532 | m_log.WarnFormat( |
533 | "[XINVENTORY SERVICE]: Caller to UpdateItem() for {0} {1} tried to alter property(s) that should be invariant, (InvType, AssetType, Folder, CreatorIdentification, Owner), existing ({2}, {3}, {4}, {5}, {6}), update ({7}, {8}, {9}, {10}, {11})", | 533 | "[XINVENTORY SERVICE]: Caller to UpdateItem() for {0} {1} tried to alter property(s) that should be invariant, (InvType, AssetType, Folder, CreatorIdentification, Owner), existing ({2}, {3}, {4}, {5}, {6}), update ({7}, {8}, {9}, {10}, {11})", |
534 | retrievedItem.Name, | 534 | retrievedItem.Name, |
535 | retrievedItem.ID, | 535 | retrievedItem.ID, |
536 | retrievedItem.InvType, | 536 | retrievedItem.InvType, |
537 | retrievedItem.AssetType, | 537 | retrievedItem.AssetType, |
538 | retrievedItem.Folder, | 538 | retrievedItem.Folder, |
539 | retrievedItem.CreatorIdentification, | 539 | retrievedItem.CreatorIdentification, |
540 | retrievedItem.Owner, | 540 | retrievedItem.Owner, |
541 | item.InvType, | 541 | item.InvType, |
542 | item.AssetType, | 542 | item.AssetType, |
@@ -639,7 +639,7 @@ namespace OpenSim.Services.InventoryService | |||
639 | return new List<InventoryItemBase>(); | 639 | return new List<InventoryItemBase>(); |
640 | 640 | ||
641 | List<InventoryItemBase> ret = new List<InventoryItemBase>(); | 641 | List<InventoryItemBase> ret = new List<InventoryItemBase>(); |
642 | 642 | ||
643 | foreach (XInventoryItem x in items) | 643 | foreach (XInventoryItem x in items) |
644 | ret.Add(ConvertToOpenSim(x)); | 644 | ret.Add(ConvertToOpenSim(x)); |
645 | 645 | ||
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 0f57c2e..32e14a1 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Services.LLLoginService | |||
61 | 61 | ||
62 | static LLFailedLoginResponse() | 62 | static LLFailedLoginResponse() |
63 | { | 63 | { |
64 | UserProblem = new LLFailedLoginResponse("key", | 64 | UserProblem = new LLFailedLoginResponse("key", |
65 | "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", | 65 | "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", |
66 | "false"); | 66 | "false"); |
67 | GridProblem = new LLFailedLoginResponse("key", | 67 | GridProblem = new LLFailedLoginResponse("key", |
@@ -307,7 +307,7 @@ namespace OpenSim.Services.LLLoginService | |||
307 | { | 307 | { |
308 | DST = dstTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N"; | 308 | DST = dstTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N"; |
309 | } | 309 | } |
310 | 310 | ||
311 | break; | 311 | break; |
312 | } | 312 | } |
313 | } | 313 | } |
@@ -417,7 +417,7 @@ namespace OpenSim.Services.LLLoginService | |||
417 | // try | 417 | // try |
418 | // { | 418 | // { |
419 | // // First try to fetch DST from Pacific Standard Time, because this is | 419 | // // First try to fetch DST from Pacific Standard Time, because this is |
420 | // // the one expected by the viewer. "US/Pacific" is the string to search | 420 | // // the one expected by the viewer. "US/Pacific" is the string to search |
421 | // // on linux and mac, and should work also on Windows (to confirm) | 421 | // // on linux and mac, and should work also on Windows (to confirm) |
422 | // gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific"); | 422 | // gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific"); |
423 | // } | 423 | // } |
@@ -447,7 +447,7 @@ namespace OpenSim.Services.LLLoginService | |||
447 | ErrorReason = "key"; | 447 | ErrorReason = "key"; |
448 | welcomeMessage = "Welcome to OpenSim!"; | 448 | welcomeMessage = "Welcome to OpenSim!"; |
449 | seedCapability = String.Empty; | 449 | seedCapability = String.Empty; |
450 | home = "{'region_handle':[" | 450 | home = "{'region_handle':[" |
451 | + "r" + Util.RegionToWorldLoc(1000).ToString() | 451 | + "r" + Util.RegionToWorldLoc(1000).ToString() |
452 | + "," | 452 | + "," |
453 | + "r" + Util.RegionToWorldLoc(1000).ToString() | 453 | + "r" + Util.RegionToWorldLoc(1000).ToString() |
@@ -593,7 +593,7 @@ namespace OpenSim.Services.LLLoginService | |||
593 | // responseData["real_currency"] = currency; | 593 | // responseData["real_currency"] = currency; |
594 | responseData["currency"] = currency; | 594 | responseData["currency"] = currency; |
595 | } | 595 | } |
596 | 596 | ||
597 | if (ClassifiedFee != String.Empty) | 597 | if (ClassifiedFee != String.Empty) |
598 | responseData["classified_fee"] = ClassifiedFee; | 598 | responseData["classified_fee"] = ClassifiedFee; |
599 | 599 | ||
@@ -1070,7 +1070,7 @@ namespace OpenSim.Services.LLLoginService | |||
1070 | get { return activeGestures; } | 1070 | get { return activeGestures; } |
1071 | set { activeGestures = value; } | 1071 | set { activeGestures = value; } |
1072 | } | 1072 | } |
1073 | 1073 | ||
1074 | public string Home | 1074 | public string Home |
1075 | { | 1075 | { |
1076 | get { return home; } | 1076 | get { return home; } |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 2941f51..fc45f86 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -131,7 +131,7 @@ namespace OpenSim.Services.LLLoginService | |||
131 | m_AllowedClients = Util.GetConfigVarFromSections<string>( | 131 | m_AllowedClients = Util.GetConfigVarFromSections<string>( |
132 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); | 132 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); |
133 | m_DeniedClients = Util.GetConfigVarFromSections<string>( | 133 | m_DeniedClients = Util.GetConfigVarFromSections<string>( |
134 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); | 134 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); |
135 | 135 | ||
136 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); | 136 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); |
137 | m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time"); | 137 | m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time"); |
@@ -180,13 +180,13 @@ namespace OpenSim.Services.LLLoginService | |||
180 | string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty); | 180 | string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty); |
181 | if (hgInvServicePlugin != string.Empty) | 181 | if (hgInvServicePlugin != string.Empty) |
182 | { | 182 | { |
183 | // TODO: Remove HGInventoryServiceConstructorArg after 0.9 release | 183 | // TODO: Remove HGInventoryServiceConstructorArg after 0.9 release |
184 | string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty); | 184 | string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty); |
185 | if (hgInvServiceArg != String.Empty) | 185 | if (hgInvServiceArg != String.Empty) |
186 | { | 186 | { |
187 | m_log.Warn("[LLOGIN SERVICE]: You are using HGInventoryServiceConstructorArg, which is deprecated. See example file for correct syntax."); | 187 | m_log.Warn("[LLOGIN SERVICE]: You are using HGInventoryServiceConstructorArg, which is deprecated. See example file for correct syntax."); |
188 | hgInvServicePlugin = hgInvServiceArg + "@" + hgInvServicePlugin; | 188 | hgInvServicePlugin = hgInvServiceArg + "@" + hgInvServicePlugin; |
189 | } | 189 | } |
190 | m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args); | 190 | m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args); |
191 | } | 191 | } |
192 | 192 | ||
@@ -270,7 +270,7 @@ namespace OpenSim.Services.LLLoginService | |||
270 | return response; | 270 | return response; |
271 | } | 271 | } |
272 | 272 | ||
273 | public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, | 273 | public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, |
274 | string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient) | 274 | string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient) |
275 | { | 275 | { |
276 | bool success = false; | 276 | bool success = false; |
@@ -283,7 +283,7 @@ namespace OpenSim.Services.LLLoginService | |||
283 | 283 | ||
284 | m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", | 284 | m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", |
285 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); | 285 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); |
286 | 286 | ||
287 | try | 287 | try |
288 | { | 288 | { |
289 | // | 289 | // |
@@ -452,7 +452,7 @@ namespace OpenSim.Services.LLLoginService | |||
452 | guinfo = new GridUserInfo(); | 452 | guinfo = new GridUserInfo(); |
453 | guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30); | 453 | guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30); |
454 | } | 454 | } |
455 | 455 | ||
456 | // | 456 | // |
457 | // Find the destination region/grid | 457 | // Find the destination region/grid |
458 | // | 458 | // |
@@ -494,7 +494,7 @@ namespace OpenSim.Services.LLLoginService | |||
494 | // | 494 | // |
495 | string reason = string.Empty; | 495 | string reason = string.Empty; |
496 | GridRegion dest; | 496 | GridRegion dest; |
497 | AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, | 497 | AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, |
498 | clientVersion, channel, mac, id0, clientIP, flags, out where, out reason, out dest); | 498 | clientVersion, channel, mac, id0, clientIP, flags, out where, out reason, out dest); |
499 | destination = dest; | 499 | destination = dest; |
500 | if (aCircuit == null) | 500 | if (aCircuit == null) |
@@ -504,7 +504,7 @@ namespace OpenSim.Services.LLLoginService | |||
504 | return new LLFailedLoginResponse("key", reason, "false"); | 504 | return new LLFailedLoginResponse("key", reason, "false"); |
505 | 505 | ||
506 | } | 506 | } |
507 | // Get Friends list | 507 | // Get Friends list |
508 | FriendInfo[] friendsList = new FriendInfo[0]; | 508 | FriendInfo[] friendsList = new FriendInfo[0]; |
509 | if (m_FriendsService != null) | 509 | if (m_FriendsService != null) |
510 | { | 510 | { |
@@ -587,7 +587,7 @@ namespace OpenSim.Services.LLLoginService | |||
587 | lookAt = pinfo.HomeLookAt; | 587 | lookAt = pinfo.HomeLookAt; |
588 | flags |= TeleportFlags.ViaHome; | 588 | flags |= TeleportFlags.ViaHome; |
589 | } | 589 | } |
590 | 590 | ||
591 | if (tryDefaults) | 591 | if (tryDefaults) |
592 | { | 592 | { |
593 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID); | 593 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID); |
@@ -648,7 +648,7 @@ namespace OpenSim.Services.LLLoginService | |||
648 | position = pinfo.LastPosition; | 648 | position = pinfo.LastPosition; |
649 | lookAt = pinfo.LastLookAt; | 649 | lookAt = pinfo.LastLookAt; |
650 | } | 650 | } |
651 | 651 | ||
652 | return region; | 652 | return region; |
653 | } | 653 | } |
654 | else | 654 | else |
@@ -684,7 +684,7 @@ namespace OpenSim.Services.LLLoginService | |||
684 | regions = m_GridService.GetDefaultRegions(scopeID); | 684 | regions = m_GridService.GetDefaultRegions(scopeID); |
685 | if (regions != null && regions.Count > 0) | 685 | if (regions != null && regions.Count > 0) |
686 | { | 686 | { |
687 | where = "safe"; | 687 | where = "safe"; |
688 | return regions[0]; | 688 | return regions[0]; |
689 | } | 689 | } |
690 | else | 690 | else |
@@ -719,7 +719,7 @@ namespace OpenSim.Services.LLLoginService | |||
719 | return null; | 719 | return null; |
720 | } | 720 | } |
721 | // Valid specification of a remote grid | 721 | // Valid specification of a remote grid |
722 | 722 | ||
723 | regionName = parts[0]; | 723 | regionName = parts[0]; |
724 | string domainLocator = parts[1]; | 724 | string domainLocator = parts[1]; |
725 | parts = domainLocator.Split(new char[] {':'}); | 725 | parts = domainLocator.Split(new char[] {':'}); |
@@ -737,7 +737,7 @@ namespace OpenSim.Services.LLLoginService | |||
737 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID); | 737 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID); |
738 | if (defaults != null && defaults.Count > 0) | 738 | if (defaults != null && defaults.Count > 0) |
739 | { | 739 | { |
740 | where = "safe"; | 740 | where = "safe"; |
741 | return defaults[0]; | 741 | return defaults[0]; |
742 | } | 742 | } |
743 | else | 743 | else |
@@ -798,7 +798,7 @@ namespace OpenSim.Services.LLLoginService | |||
798 | string homeURI = null; | 798 | string homeURI = null; |
799 | if (account.ServiceURLs != null && account.ServiceURLs.ContainsKey("HomeURI")) | 799 | if (account.ServiceURLs != null && account.ServiceURLs.ContainsKey("HomeURI")) |
800 | homeURI = (string)account.ServiceURLs["HomeURI"]; | 800 | homeURI = (string)account.ServiceURLs["HomeURI"]; |
801 | 801 | ||
802 | GridRegion destination = m_GatekeeperConnector.GetHyperlinkRegion(gatekeeper, regionID, account.PrincipalID, homeURI, out message); | 802 | GridRegion destination = m_GatekeeperConnector.GetHyperlinkRegion(gatekeeper, regionID, account.PrincipalID, homeURI, out message); |
803 | return destination; | 803 | return destination; |
804 | } | 804 | } |
@@ -917,8 +917,8 @@ namespace OpenSim.Services.LLLoginService | |||
917 | return null; | 917 | return null; |
918 | } | 918 | } |
919 | 919 | ||
920 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, | 920 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, |
921 | AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, | 921 | AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, |
922 | string ipaddress, string viewer, string channel, string mac, string id0) | 922 | string ipaddress, string viewer, string channel, string mac, string id0) |
923 | { | 923 | { |
924 | AgentCircuitData aCircuit = new AgentCircuitData(); | 924 | AgentCircuitData aCircuit = new AgentCircuitData(); |
@@ -956,7 +956,7 @@ namespace OpenSim.Services.LLLoginService | |||
956 | if (account.ServiceURLs == null) | 956 | if (account.ServiceURLs == null) |
957 | return; | 957 | return; |
958 | 958 | ||
959 | // Old style: get the service keys from the DB | 959 | // Old style: get the service keys from the DB |
960 | foreach (KeyValuePair<string, object> kvp in account.ServiceURLs) | 960 | foreach (KeyValuePair<string, object> kvp in account.ServiceURLs) |
961 | { | 961 | { |
962 | if (kvp.Value != null) | 962 | if (kvp.Value != null) |
@@ -1053,7 +1053,7 @@ namespace OpenSim.Services.LLLoginService | |||
1053 | switch (subcommand) | 1053 | switch (subcommand) |
1054 | { | 1054 | { |
1055 | case "level": | 1055 | case "level": |
1056 | // Set the minimum level to allow login | 1056 | // Set the minimum level to allow login |
1057 | // Useful to allow grid update without worrying about users. | 1057 | // Useful to allow grid update without worrying about users. |
1058 | // or fixing critical issues | 1058 | // or fixing critical issues |
1059 | // | 1059 | // |
diff --git a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs index ee9c333..005ddd8 100644 --- a/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.LLLoginService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.LLLoginService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs index 7249e70..c90f5bd 100644 --- a/OpenSim/Services/MapImageService/MapImageService.cs +++ b/OpenSim/Services/MapImageService/MapImageService.cs | |||
@@ -23,8 +23,8 @@ | |||
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 | * The design of this map service is based on SimianGrid's PHP-based | 27 | * The design of this map service is based on SimianGrid's PHP-based |
28 | * map service. See this URL for the original PHP version: | 28 | * map service. See this URL for the original PHP version: |
29 | * https://github.com/openmetaversefoundation/simiangrid/ | 29 | * https://github.com/openmetaversefoundation/simiangrid/ |
30 | */ | 30 | */ |
@@ -291,7 +291,7 @@ namespace OpenSim.Services.MapImageService | |||
291 | { | 291 | { |
292 | try | 292 | try |
293 | { | 293 | { |
294 | if (File.Exists(fileName)) | 294 | if (File.Exists(fileName)) |
295 | return new Bitmap(fileName); | 295 | return new Bitmap(fileName); |
296 | 296 | ||
297 | else | 297 | else |
diff --git a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs index 53a33d6..8f4b9b9 100644 --- a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.MapImageService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.MapImageService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index 0fe0200..ae92919 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Services.PresenceService | |||
71 | data.SessionID = sessionID; | 71 | data.SessionID = sessionID; |
72 | data.Data = new Dictionary<string, string>(); | 72 | data.Data = new Dictionary<string, string>(); |
73 | data.Data["SecureSessionID"] = secureSessionID.ToString(); | 73 | data.Data["SecureSessionID"] = secureSessionID.ToString(); |
74 | 74 | ||
75 | m_Database.Store(data); | 75 | m_Database.Store(data); |
76 | 76 | ||
77 | string prevUserStr = ""; | 77 | string prevUserStr = ""; |
@@ -80,7 +80,7 @@ namespace OpenSim.Services.PresenceService | |||
80 | 80 | ||
81 | m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent: session {0}, user {1}, region {2}, secure session {3}{4}", | 81 | m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent: session {0}, user {1}, region {2}, secure session {3}{4}", |
82 | data.SessionID, data.UserID, data.RegionID, secureSessionID, prevUserStr); | 82 | data.SessionID, data.UserID, data.RegionID, secureSessionID, prevUserStr); |
83 | 83 | ||
84 | return true; | 84 | return true; |
85 | } | 85 | } |
86 | 86 | ||
@@ -92,7 +92,7 @@ namespace OpenSim.Services.PresenceService | |||
92 | sessionID, | 92 | sessionID, |
93 | (presence == null) ? null : presence.UserID, | 93 | (presence == null) ? null : presence.UserID, |
94 | (presence == null) ? null : presence.RegionID.ToString()); | 94 | (presence == null) ? null : presence.RegionID.ToString()); |
95 | 95 | ||
96 | return m_Database.Delete("SessionID", sessionID.ToString()); | 96 | return m_Database.Delete("SessionID", sessionID.ToString()); |
97 | } | 97 | } |
98 | 98 | ||
@@ -144,7 +144,7 @@ namespace OpenSim.Services.PresenceService | |||
144 | public PresenceInfo GetAgent(UUID sessionID) | 144 | public PresenceInfo GetAgent(UUID sessionID) |
145 | { | 145 | { |
146 | PresenceInfo ret = new PresenceInfo(); | 146 | PresenceInfo ret = new PresenceInfo(); |
147 | 147 | ||
148 | PresenceData data = m_Database.Get(sessionID); | 148 | PresenceData data = m_Database.Get(sessionID); |
149 | if (data == null) | 149 | if (data == null) |
150 | return null; | 150 | return null; |
diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs index a4adb2f..7647865 100644 --- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs +++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Services.PresenceService | |||
68 | connString = presenceConfig.GetString("ConnectionString", connString); | 68 | connString = presenceConfig.GetString("ConnectionString", connString); |
69 | realm = presenceConfig.GetString("Realm", realm); | 69 | realm = presenceConfig.GetString("Realm", realm); |
70 | } | 70 | } |
71 | 71 | ||
72 | // | 72 | // |
73 | // We tried, but this doesn't exist. We can't proceed. | 73 | // We tried, but this doesn't exist. We can't proceed. |
74 | // | 74 | // |
diff --git a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs index af6ec65..a79bc9f 100644 --- a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.PresenceService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.PresenceService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs index 5013152..c473d4a 100644 --- a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs +++ b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Services.UserAccountService | |||
41 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | public AgentPreferencesService(IConfigSource config) : base(config) | 44 | public AgentPreferencesService(IConfigSource config) : base(config) |
45 | { | 45 | { |
46 | m_log.Debug("[AGENT PREFERENCES SERVICE]: Starting agent preferences service"); | 46 | m_log.Debug("[AGENT PREFERENCES SERVICE]: Starting agent preferences service"); |
47 | } | 47 | } |
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs index e4bcf15..3cb672e 100644 --- a/OpenSim/Services/UserAccountService/GridUserService.cs +++ b/OpenSim/Services/UserAccountService/GridUserService.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Services.UserAccountService | |||
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | private static bool m_Initialized; | 46 | private static bool m_Initialized; |
47 | 47 | ||
48 | public GridUserService(IConfigSource config) : base(config) | 48 | public GridUserService(IConfigSource config) : base(config) |
49 | { | 49 | { |
50 | m_log.Debug("[GRID USER SERVICE]: Starting user grid service"); | 50 | m_log.Debug("[GRID USER SERVICE]: Starting user grid service"); |
51 | 51 | ||
diff --git a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs index 8c5f5df..f9a7260 100644 --- a/OpenSim/Services/UserAccountService/GridUserServiceBase.cs +++ b/OpenSim/Services/UserAccountService/GridUserServiceBase.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Services.UserAccountService | |||
67 | connString = usersConfig.GetString("ConnectionString", connString); | 67 | connString = usersConfig.GetString("ConnectionString", connString); |
68 | realm = usersConfig.GetString("Realm", realm); | 68 | realm = usersConfig.GetString("Realm", realm); |
69 | } | 69 | } |
70 | 70 | ||
71 | // | 71 | // |
72 | // We tried, but this doesn't exist. We can't proceed. | 72 | // We tried, but this doesn't exist. We can't proceed. |
73 | // | 73 | // |
diff --git a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs b/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs index 77ca083..0c1464d 100644 --- a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.UserAccountService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.UserAccountService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 706d475..7120aeb 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -764,7 +764,7 @@ namespace OpenSim.Services.UserAccountService | |||
764 | string[] modelSpecifiers = model.Split(); | 764 | string[] modelSpecifiers = model.Split(); |
765 | if (modelSpecifiers.Length != 2) | 765 | if (modelSpecifiers.Length != 2) |
766 | { | 766 | { |
767 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Invalid model name \'{0}\'. Falling back to Ruth for {1}", | 767 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Invalid model name \'{0}\'. Falling back to Ruth for {1}", |
768 | model, destinationAgent); | 768 | model, destinationAgent); |
769 | CreateDefaultAppearanceEntries(destinationAgent); | 769 | CreateDefaultAppearanceEntries(destinationAgent); |
770 | return; | 770 | return; |
@@ -774,7 +774,7 @@ namespace OpenSim.Services.UserAccountService | |||
774 | UserAccount modelAccount = GetUserAccount(UUID.Zero, modelSpecifiers[0], modelSpecifiers[1]); | 774 | UserAccount modelAccount = GetUserAccount(UUID.Zero, modelSpecifiers[0], modelSpecifiers[1]); |
775 | if (modelAccount == null) | 775 | if (modelAccount == null) |
776 | { | 776 | { |
777 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Requested model \'{0}\' not found. Falling back to Ruth for {1}", | 777 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Requested model \'{0}\' not found. Falling back to Ruth for {1}", |
778 | model, destinationAgent); | 778 | model, destinationAgent); |
779 | CreateDefaultAppearanceEntries(destinationAgent); | 779 | CreateDefaultAppearanceEntries(destinationAgent); |
780 | return; | 780 | return; |
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs index 9a52e02..76aa093 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Services.ProfilesService | |||
45 | static readonly ILog m_log = | 45 | static readonly ILog m_log = |
46 | LogManager.GetLogger( | 46 | LogManager.GetLogger( |
47 | MethodBase.GetCurrentMethod().DeclaringType); | 47 | MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | IUserAccountService userAccounts; | 49 | IUserAccountService userAccounts; |
50 | 50 | ||
51 | public UserProfilesService(IConfigSource config, string configName): | 51 | public UserProfilesService(IConfigSource config, string configName): |
@@ -58,23 +58,23 @@ namespace OpenSim.Services.ProfilesService | |||
58 | return; | 58 | return; |
59 | } | 59 | } |
60 | Object[] args = null; | 60 | Object[] args = null; |
61 | 61 | ||
62 | args = new Object[] { config }; | 62 | args = new Object[] { config }; |
63 | string accountService = Config.GetString("UserAccountService", String.Empty); | 63 | string accountService = Config.GetString("UserAccountService", String.Empty); |
64 | if (accountService != string.Empty) | 64 | if (accountService != string.Empty) |
65 | userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); | 65 | userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); |
66 | 66 | ||
67 | args = new Object[] { config }; | 67 | args = new Object[] { config }; |
68 | } | 68 | } |
69 | 69 | ||
70 | #region Classifieds | 70 | #region Classifieds |
71 | public OSD AvatarClassifiedsRequest(UUID creatorId) | 71 | public OSD AvatarClassifiedsRequest(UUID creatorId) |
72 | { | 72 | { |
73 | OSDArray records = ProfilesData.GetClassifiedRecords(creatorId); | 73 | OSDArray records = ProfilesData.GetClassifiedRecords(creatorId); |
74 | 74 | ||
75 | return records; | 75 | return records; |
76 | } | 76 | } |
77 | 77 | ||
78 | public bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result) | 78 | public bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result) |
79 | { | 79 | { |
80 | if(!ProfilesData.UpdateClassifiedRecord(ad, ref result)) | 80 | if(!ProfilesData.UpdateClassifiedRecord(ad, ref result)) |
@@ -84,74 +84,74 @@ namespace OpenSim.Services.ProfilesService | |||
84 | result = "success"; | 84 | result = "success"; |
85 | return true; | 85 | return true; |
86 | } | 86 | } |
87 | 87 | ||
88 | public bool ClassifiedDelete(UUID recordId) | 88 | public bool ClassifiedDelete(UUID recordId) |
89 | { | 89 | { |
90 | if(ProfilesData.DeleteClassifiedRecord(recordId)) | 90 | if(ProfilesData.DeleteClassifiedRecord(recordId)) |
91 | return true; | 91 | return true; |
92 | 92 | ||
93 | return false; | 93 | return false; |
94 | } | 94 | } |
95 | 95 | ||
96 | public bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result) | 96 | public bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result) |
97 | { | 97 | { |
98 | if(ProfilesData.GetClassifiedInfo(ref ad, ref result)) | 98 | if(ProfilesData.GetClassifiedInfo(ref ad, ref result)) |
99 | return true; | 99 | return true; |
100 | 100 | ||
101 | return false; | 101 | return false; |
102 | } | 102 | } |
103 | #endregion Classifieds | 103 | #endregion Classifieds |
104 | 104 | ||
105 | #region Picks | 105 | #region Picks |
106 | public OSD AvatarPicksRequest(UUID creatorId) | 106 | public OSD AvatarPicksRequest(UUID creatorId) |
107 | { | 107 | { |
108 | OSDArray records = ProfilesData.GetAvatarPicks(creatorId); | 108 | OSDArray records = ProfilesData.GetAvatarPicks(creatorId); |
109 | 109 | ||
110 | return records; | 110 | return records; |
111 | } | 111 | } |
112 | 112 | ||
113 | public bool PickInfoRequest(ref UserProfilePick pick, ref string result) | 113 | public bool PickInfoRequest(ref UserProfilePick pick, ref string result) |
114 | { | 114 | { |
115 | pick = ProfilesData.GetPickInfo(pick.CreatorId, pick.PickId); | 115 | pick = ProfilesData.GetPickInfo(pick.CreatorId, pick.PickId); |
116 | result = "OK"; | 116 | result = "OK"; |
117 | return true; | 117 | return true; |
118 | } | 118 | } |
119 | 119 | ||
120 | public bool PicksUpdate(ref UserProfilePick pick, ref string result) | 120 | public bool PicksUpdate(ref UserProfilePick pick, ref string result) |
121 | { | 121 | { |
122 | return ProfilesData.UpdatePicksRecord(pick); | 122 | return ProfilesData.UpdatePicksRecord(pick); |
123 | } | 123 | } |
124 | 124 | ||
125 | public bool PicksDelete(UUID pickId) | 125 | public bool PicksDelete(UUID pickId) |
126 | { | 126 | { |
127 | return ProfilesData.DeletePicksRecord(pickId); | 127 | return ProfilesData.DeletePicksRecord(pickId); |
128 | } | 128 | } |
129 | #endregion Picks | 129 | #endregion Picks |
130 | 130 | ||
131 | #region Notes | 131 | #region Notes |
132 | public bool AvatarNotesRequest(ref UserProfileNotes note) | 132 | public bool AvatarNotesRequest(ref UserProfileNotes note) |
133 | { | 133 | { |
134 | return ProfilesData.GetAvatarNotes(ref note); | 134 | return ProfilesData.GetAvatarNotes(ref note); |
135 | } | 135 | } |
136 | 136 | ||
137 | public bool NotesUpdate(ref UserProfileNotes note, ref string result) | 137 | public bool NotesUpdate(ref UserProfileNotes note, ref string result) |
138 | { | 138 | { |
139 | return ProfilesData.UpdateAvatarNotes(ref note, ref result); | 139 | return ProfilesData.UpdateAvatarNotes(ref note, ref result); |
140 | } | 140 | } |
141 | #endregion Notes | 141 | #endregion Notes |
142 | 142 | ||
143 | #region Profile Properties | 143 | #region Profile Properties |
144 | public bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result) | 144 | public bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result) |
145 | { | 145 | { |
146 | return ProfilesData.GetAvatarProperties(ref prop, ref result); | 146 | return ProfilesData.GetAvatarProperties(ref prop, ref result); |
147 | } | 147 | } |
148 | 148 | ||
149 | public bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result) | 149 | public bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result) |
150 | { | 150 | { |
151 | return ProfilesData.UpdateAvatarProperties(ref prop, ref result); | 151 | return ProfilesData.UpdateAvatarProperties(ref prop, ref result); |
152 | } | 152 | } |
153 | #endregion Profile Properties | 153 | #endregion Profile Properties |
154 | 154 | ||
155 | #region Interests | 155 | #region Interests |
156 | public bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result) | 156 | public bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result) |
157 | { | 157 | { |
@@ -254,7 +254,7 @@ namespace OpenSim.Services.ProfilesService | |||
254 | { | 254 | { |
255 | return ProfilesData.GetUserAppData(ref prop, ref result); | 255 | return ProfilesData.GetUserAppData(ref prop, ref result); |
256 | } | 256 | } |
257 | 257 | ||
258 | public bool SetUserAppData(UserAppData prop, ref string result) | 258 | public bool SetUserAppData(UserAppData prop, ref string result) |
259 | { | 259 | { |
260 | return true; | 260 | return true; |
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs index c31578f..48b43a6 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Services.ProfilesService | |||
68 | if (string.IsNullOrEmpty(connString)) | 68 | if (string.IsNullOrEmpty(connString)) |
69 | connString = dbConfig.GetString("ConnectionString", String.Empty); | 69 | connString = dbConfig.GetString("ConnectionString", String.Empty); |
70 | } | 70 | } |
71 | 71 | ||
72 | IConfig ProfilesConfig = config.Configs[configName]; | 72 | IConfig ProfilesConfig = config.Configs[configName]; |
73 | if (ProfilesConfig != null) | 73 | if (ProfilesConfig != null) |
74 | { | 74 | { |
@@ -76,7 +76,7 @@ namespace OpenSim.Services.ProfilesService | |||
76 | connString = ProfilesConfig.GetString("ConnectionString", connString); | 76 | connString = ProfilesConfig.GetString("ConnectionString", connString); |
77 | realm = ProfilesConfig.GetString("Realm", realm); | 77 | realm = ProfilesConfig.GetString("Realm", realm); |
78 | } | 78 | } |
79 | 79 | ||
80 | ProfilesData = LoadPlugin<IProfilesData>(dllName, new Object[] { connString }); | 80 | ProfilesData = LoadPlugin<IProfilesData>(dllName, new Object[] { connString }); |
81 | if (ProfilesData == null) | 81 | if (ProfilesData == null) |
82 | throw new Exception("Could not find a storage interface in the given module"); | 82 | throw new Exception("Could not find a storage interface in the given module"); |