diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Server/Handlers | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to '')
31 files changed, 142 insertions, 142 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs index ab81dd6..bad3ea2 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | |||
@@ -151,27 +151,27 @@ namespace OpenSim.Server.Handlers.Asset | |||
151 | MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId); | 151 | MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId); |
152 | return; | 152 | return; |
153 | } | 153 | } |
154 | 154 | ||
155 | AssetBase asset = m_AssetService.Get(assetId.ToString()); | 155 | AssetBase asset = m_AssetService.Get(assetId.ToString()); |
156 | if (asset == null) | 156 | if (asset == null) |
157 | { | 157 | { |
158 | MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId); | 158 | MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId); |
159 | return; | 159 | return; |
160 | } | 160 | } |
161 | 161 | ||
162 | string fileName = rawAssetId; | 162 | string fileName = rawAssetId; |
163 | 163 | ||
164 | if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, fileName)) | 164 | if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, fileName)) |
165 | return; | 165 | return; |
166 | 166 | ||
167 | using (FileStream fs = new FileStream(fileName, FileMode.CreateNew)) | 167 | using (FileStream fs = new FileStream(fileName, FileMode.CreateNew)) |
168 | { | 168 | { |
169 | using (BinaryWriter bw = new BinaryWriter(fs)) | 169 | using (BinaryWriter bw = new BinaryWriter(fs)) |
170 | { | 170 | { |
171 | bw.Write(asset.Data); | 171 | bw.Write(asset.Data); |
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | MainConsole.Instance.OutputFormat("Asset dumped to file {0}", fileName); | 175 | MainConsole.Instance.OutputFormat("Asset dumped to file {0}", fileName); |
176 | } | 176 | } |
177 | 177 | ||
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs index 91c5c54..8bfc690 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
53 | public AssetServerGetHandler(IAssetService service) : | 53 | public AssetServerGetHandler(IAssetService service) : |
54 | base("GET", "/assets") | 54 | base("GET", "/assets") |
55 | { | 55 | { |
56 | m_AssetService = service; | 56 | m_AssetService = service; |
57 | } | 57 | } |
58 | 58 | ||
59 | public AssetServerGetHandler(IAssetService service, IServiceAuth auth, string redirectURL) : | 59 | public AssetServerGetHandler(IAssetService service, IServiceAuth auth, string redirectURL) : |
@@ -155,7 +155,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
155 | httpResponse.ContentType = "text/plain"; | 155 | httpResponse.ContentType = "text/plain"; |
156 | result = new byte[0]; | 156 | result = new byte[0]; |
157 | } | 157 | } |
158 | 158 | ||
159 | if (httpResponse.StatusCode == (int)HttpStatusCode.NotFound && !string.IsNullOrEmpty(m_RedirectURL) && !string.IsNullOrEmpty(id)) | 159 | if (httpResponse.StatusCode == (int)HttpStatusCode.NotFound && !string.IsNullOrEmpty(m_RedirectURL) && !string.IsNullOrEmpty(id)) |
160 | { | 160 | { |
161 | httpResponse.StatusCode = (int)HttpStatusCode.Redirect; | 161 | httpResponse.StatusCode = (int)HttpStatusCode.Redirect; |
diff --git a/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs b/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs index faa6fb7..4d2228a 100644 --- a/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs +++ b/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs | |||
@@ -52,8 +52,8 @@ namespace OpenSim.Server.Handlers.Asset.Test | |||
52 | 52 | ||
53 | UUID assetId = TestHelpers.ParseTail(0x1); | 53 | UUID assetId = TestHelpers.ParseTail(0x1); |
54 | 54 | ||
55 | IConfigSource config = new IniConfigSource(); | 55 | IConfigSource config = new IniConfigSource(); |
56 | config.AddConfig("AssetService"); | 56 | config.AddConfig("AssetService"); |
57 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 57 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
58 | 58 | ||
59 | AssetService assetService = new AssetService(config); | 59 | AssetService assetService = new AssetService(config); |
@@ -72,7 +72,7 @@ namespace OpenSim.Server.Handlers.Asset.Test | |||
72 | XmlSerializer serializer = new XmlSerializer(typeof(AssetBase)); | 72 | XmlSerializer serializer = new XmlSerializer(typeof(AssetBase)); |
73 | serializer.Serialize(writer, asset); | 73 | serializer.Serialize(writer, asset); |
74 | writer.Flush(); | 74 | writer.Flush(); |
75 | } | 75 | } |
76 | 76 | ||
77 | buffer.Position = 0; | 77 | buffer.Position = 0; |
78 | asph.Handle(null, buffer, null, null); | 78 | asph.Handle(null, buffer, null, null); |
@@ -87,13 +87,13 @@ namespace OpenSim.Server.Handlers.Asset.Test | |||
87 | { | 87 | { |
88 | TestHelpers.InMethod(); | 88 | TestHelpers.InMethod(); |
89 | 89 | ||
90 | IConfigSource config = new IniConfigSource(); | 90 | IConfigSource config = new IniConfigSource(); |
91 | config.AddConfig("AssetService"); | 91 | config.AddConfig("AssetService"); |
92 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 92 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
93 | 93 | ||
94 | AssetService assetService = new AssetService(config); | 94 | AssetService assetService = new AssetService(config); |
95 | 95 | ||
96 | AssetServerPostHandler asph = new AssetServerPostHandler(assetService); | 96 | AssetServerPostHandler asph = new AssetServerPostHandler(assetService); |
97 | 97 | ||
98 | MemoryStream buffer = new MemoryStream(); | 98 | MemoryStream buffer = new MemoryStream(); |
99 | byte[] badData = new byte[] { 0x48, 0x65, 0x6c, 0x6c, 0x6f }; | 99 | byte[] badData = new byte[] { 0x48, 0x65, 0x6c, 0x6c, 0x6f }; |
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs index 6ee98b3..d3ea7e2 100644 --- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs | |||
@@ -132,41 +132,41 @@ namespace OpenSim.Server.Handlers.Authentication | |||
132 | case "authenticate": | 132 | case "authenticate": |
133 | if (!request.ContainsKey("PASSWORD")) | 133 | if (!request.ContainsKey("PASSWORD")) |
134 | return FailureResult(); | 134 | return FailureResult(); |
135 | 135 | ||
136 | token = m_AuthenticationService.Authenticate(principalID, request["PASSWORD"].ToString(), lifetime); | 136 | token = m_AuthenticationService.Authenticate(principalID, request["PASSWORD"].ToString(), lifetime); |
137 | 137 | ||
138 | if (token != String.Empty) | 138 | if (token != String.Empty) |
139 | return SuccessResult(token); | 139 | return SuccessResult(token); |
140 | return FailureResult(); | 140 | return FailureResult(); |
141 | 141 | ||
142 | case "setpassword": | 142 | case "setpassword": |
143 | if (!m_AllowSetPassword) | 143 | if (!m_AllowSetPassword) |
144 | return FailureResult(); | 144 | return FailureResult(); |
145 | 145 | ||
146 | if (!request.ContainsKey("PASSWORD")) | 146 | if (!request.ContainsKey("PASSWORD")) |
147 | return FailureResult(); | 147 | return FailureResult(); |
148 | 148 | ||
149 | if (m_AuthenticationService.SetPassword(principalID, request["PASSWORD"].ToString())) | 149 | if (m_AuthenticationService.SetPassword(principalID, request["PASSWORD"].ToString())) |
150 | return SuccessResult(); | 150 | return SuccessResult(); |
151 | else | 151 | else |
152 | return FailureResult(); | 152 | return FailureResult(); |
153 | 153 | ||
154 | case "verify": | 154 | case "verify": |
155 | if (!request.ContainsKey("TOKEN")) | 155 | if (!request.ContainsKey("TOKEN")) |
156 | return FailureResult(); | 156 | return FailureResult(); |
157 | 157 | ||
158 | if (m_AuthenticationService.Verify(principalID, request["TOKEN"].ToString(), lifetime)) | 158 | if (m_AuthenticationService.Verify(principalID, request["TOKEN"].ToString(), lifetime)) |
159 | return SuccessResult(); | 159 | return SuccessResult(); |
160 | 160 | ||
161 | return FailureResult(); | 161 | return FailureResult(); |
162 | 162 | ||
163 | case "release": | 163 | case "release": |
164 | if (!request.ContainsKey("TOKEN")) | 164 | if (!request.ContainsKey("TOKEN")) |
165 | return FailureResult(); | 165 | return FailureResult(); |
166 | 166 | ||
167 | if (m_AuthenticationService.Release(principalID, request["TOKEN"].ToString())) | 167 | if (m_AuthenticationService.Release(principalID, request["TOKEN"].ToString())) |
168 | return SuccessResult(); | 168 | return SuccessResult(); |
169 | 169 | ||
170 | return FailureResult(); | 170 | return FailureResult(); |
171 | 171 | ||
172 | case "getauthinfo": | 172 | case "getauthinfo": |
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs index 6464399..ac8ff52 100644 --- a/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs +++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Server.Handlers.Authentication | |||
41 | private static readonly ILog m_log = | 41 | private static readonly ILog m_log = |
42 | LogManager.GetLogger( | 42 | LogManager.GetLogger( |
43 | MethodBase.GetCurrentMethod().DeclaringType); | 43 | MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | private IAuthenticationService m_AuthenticationService; | 45 | private IAuthenticationService m_AuthenticationService; |
46 | private IUserAccountService m_UserAccountService; | 46 | private IUserAccountService m_UserAccountService; |
47 | private string m_ConfigName = "OpenIdService"; | 47 | private string m_ConfigName = "OpenIdService"; |
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs index b201dc7..a6605a1 100644 --- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs +++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs | |||
@@ -178,14 +178,14 @@ namespace OpenSim.Server.Handlers.Authentication | |||
178 | "; | 178 | "; |
179 | 179 | ||
180 | /// <summary>Page shown for an invalid OpenID identity</summary> | 180 | /// <summary>Page shown for an invalid OpenID identity</summary> |
181 | const string INVALID_OPENID_PAGE = | 181 | const string INVALID_OPENID_PAGE = |
182 | @"<html><head><title>Identity not found</title></head> | 182 | @"<html><head><title>Identity not found</title></head> |
183 | <body>Invalid OpenID identity</body></html>"; | 183 | <body>Invalid OpenID identity</body></html>"; |
184 | 184 | ||
185 | /// <summary>Page shown if the OpenID endpoint is requested directly</summary> | 185 | /// <summary>Page shown if the OpenID endpoint is requested directly</summary> |
186 | const string ENDPOINT_PAGE = | 186 | const string ENDPOINT_PAGE = |
187 | @"<html><head><title>OpenID Endpoint</title></head><body> | 187 | @"<html><head><title>OpenID Endpoint</title></head><body> |
188 | This is an OpenID server endpoint, not a human-readable resource. | 188 | This is an OpenID server endpoint, not a human-readable resource. |
189 | For more information, see <a href='http://openid.net/'>http://openid.net/</a>. | 189 | For more information, see <a href='http://openid.net/'>http://openid.net/</a>. |
190 | </body></html>"; | 190 | </body></html>"; |
191 | 191 | ||
@@ -241,7 +241,7 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>. | |||
241 | // Check for form POST data | 241 | // Check for form POST data |
242 | if (passwordValues != null && passwordValues.Length == 1) | 242 | if (passwordValues != null && passwordValues.Length == 1) |
243 | { | 243 | { |
244 | if (account != null && | 244 | if (account != null && |
245 | (m_authenticationService.Authenticate(account.PrincipalID,Util.Md5Hash(passwordValues[0]), 30) != string.Empty)) | 245 | (m_authenticationService.Authenticate(account.PrincipalID,Util.Md5Hash(passwordValues[0]), 30) != string.Empty)) |
246 | authRequest.IsAuthenticated = true; | 246 | authRequest.IsAuthenticated = true; |
247 | else | 247 | else |
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs index c9b4e9b..310a542 100644 --- a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Server.Handlers.Authorization | |||
67 | 67 | ||
68 | xs = new XmlSerializer(typeof(AuthorizationResponse)); | 68 | xs = new XmlSerializer(typeof(AuthorizationResponse)); |
69 | return ServerUtils.SerializeResult(xs, result); | 69 | return ServerUtils.SerializeResult(xs, result); |
70 | 70 | ||
71 | } | 71 | } |
72 | } | 72 | } |
73 | } | 73 | } |
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs index ff8699f..69c1a89 100644 --- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs | |||
@@ -175,7 +175,7 @@ namespace OpenSim.Server.Handlers.Avatar | |||
175 | request.Remove("METHOD"); | 175 | request.Remove("METHOD"); |
176 | request.Remove("UserID"); | 176 | request.Remove("UserID"); |
177 | } | 177 | } |
178 | 178 | ||
179 | byte[] SetItems(Dictionary<string, object> request) | 179 | byte[] SetItems(Dictionary<string, object> request) |
180 | { | 180 | { |
181 | UUID user = UUID.Zero; | 181 | UUID user = UUID.Zero; |
@@ -196,7 +196,7 @@ namespace OpenSim.Server.Handlers.Avatar | |||
196 | names = _names.ToArray(); | 196 | names = _names.ToArray(); |
197 | List<string> _values = (List<string>)request["Values"]; | 197 | List<string> _values = (List<string>)request["Values"]; |
198 | values = _values.ToArray(); | 198 | values = _values.ToArray(); |
199 | 199 | ||
200 | if (m_AvatarService.SetItems(user, names, values)) | 200 | if (m_AvatarService.SetItems(user, names, values)) |
201 | return SuccessResult(); | 201 | return SuccessResult(); |
202 | 202 | ||
@@ -227,7 +227,7 @@ namespace OpenSim.Server.Handlers.Avatar | |||
227 | } | 227 | } |
228 | 228 | ||
229 | 229 | ||
230 | 230 | ||
231 | private byte[] SuccessResult() | 231 | private byte[] SuccessResult() |
232 | { | 232 | { |
233 | XmlDocument doc = new XmlDocument(); | 233 | XmlDocument doc = new XmlDocument(); |
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs b/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs index 4c12967..4386a2d 100644 --- a/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs +++ b/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.BakedTextures | |||
61 | ServerUtils.LoadPlugin<IBakedTextureService>(assetService, args); | 61 | ServerUtils.LoadPlugin<IBakedTextureService>(assetService, args); |
62 | 62 | ||
63 | IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); | 63 | IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); |
64 | 64 | ||
65 | server.AddStreamHandler(new BakesServerGetHandler(m_BakesService, auth)); | 65 | server.AddStreamHandler(new BakesServerGetHandler(m_BakesService, auth)); |
66 | server.AddStreamHandler(new BakesServerPostHandler(m_BakesService, auth)); | 66 | server.AddStreamHandler(new BakesServerPostHandler(m_BakesService, auth)); |
67 | } | 67 | } |
diff --git a/OpenSim/Server/Handlers/Base/ServerConnector.cs b/OpenSim/Server/Handlers/Base/ServerConnector.cs index 72014db..0a4df54 100644 --- a/OpenSim/Server/Handlers/Base/ServerConnector.cs +++ b/OpenSim/Server/Handlers/Base/ServerConnector.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Server.Handlers.Base | |||
72 | 72 | ||
73 | // We call this from our plugin module to get our configuration | 73 | // We call this from our plugin module to get our configuration |
74 | public IConfig GetConfig() | 74 | public IConfig GetConfig() |
75 | { | 75 | { |
76 | IConfig config = null; | 76 | IConfig config = null; |
77 | config = ServerUtils.GetConfig(ConfigFile, ConfigName); | 77 | config = ServerUtils.GetConfig(ConfigFile, ConfigName); |
78 | 78 | ||
@@ -96,12 +96,12 @@ namespace OpenSim.Server.Handlers.Base | |||
96 | 96 | ||
97 | // We get our remote initial configuration for bootstrapping in case | 97 | // We get our remote initial configuration for bootstrapping in case |
98 | // we have no configuration in our main file or in an existing | 98 | // we have no configuration in our main file or in an existing |
99 | // modular config file. This is the last resort to bootstrap the | 99 | // modular config file. This is the last resort to bootstrap the |
100 | // configuration, likely a new plugin loading for the first time. | 100 | // configuration, likely a new plugin loading for the first time. |
101 | private IConfigSource GetConfigSource() | 101 | private IConfigSource GetConfigSource() |
102 | { | 102 | { |
103 | IConfigSource source = null; | 103 | IConfigSource source = null; |
104 | 104 | ||
105 | source = ServerUtils.LoadInitialConfig(ConfigURL); | 105 | source = ServerUtils.LoadInitialConfig(ConfigURL); |
106 | 106 | ||
107 | if (source == null) | 107 | if (source == null) |
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs index 346af32..2aec045 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | |||
@@ -83,10 +83,10 @@ namespace OpenSim.Server.Handlers.Grid | |||
83 | { | 83 | { |
84 | _info["login"] | 84 | _info["login"] |
85 | = String.Format( | 85 | = String.Format( |
86 | "http://127.0.0.1:{0}/", | 86 | "http://127.0.0.1:{0}/", |
87 | netCfg.GetString( | 87 | netCfg.GetString( |
88 | "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString())); | 88 | "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString())); |
89 | 89 | ||
90 | IssueWarning(); | 90 | IssueWarning(); |
91 | } | 91 | } |
92 | else | 92 | else |
@@ -99,7 +99,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
99 | { | 99 | { |
100 | _log.Warn("[GRID INFO SERVICE]: Cannot get grid info from config source, using minimal defaults"); | 100 | _log.Warn("[GRID INFO SERVICE]: Cannot get grid info from config source, using minimal defaults"); |
101 | } | 101 | } |
102 | 102 | ||
103 | _log.DebugFormat("[GRID INFO SERVICE]: Grid info service initialized with {0} keys", _info.Count); | 103 | _log.DebugFormat("[GRID INFO SERVICE]: Grid info service initialized with {0} keys", _info.Count); |
104 | } | 104 | } |
105 | 105 | ||
@@ -107,7 +107,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
107 | { | 107 | { |
108 | _log.Warn("[GRID INFO SERVICE]: found no [GridInfo] section in your configuration files"); | 108 | _log.Warn("[GRID INFO SERVICE]: found no [GridInfo] section in your configuration files"); |
109 | _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:"); | 109 | _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:"); |
110 | 110 | ||
111 | foreach (string k in _info.Keys) | 111 | foreach (string k in _info.Keys) |
112 | { | 112 | { |
113 | _log.WarnFormat("[GRID INFO SERVICE]: {0}: {1}", k, _info[k]); | 113 | _log.WarnFormat("[GRID INFO SERVICE]: {0}: {1}", k, _info[k]); |
@@ -181,7 +181,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
181 | new string[] { "Startup", "Hypergrid" }, String.Empty); | 181 | new string[] { "Startup", "Hypergrid" }, String.Empty); |
182 | 182 | ||
183 | if (!String.IsNullOrEmpty(HomeURI)) | 183 | if (!String.IsNullOrEmpty(HomeURI)) |
184 | map["home"] = OSD.FromString(HomeURI); | 184 | map["home"] = OSD.FromString(HomeURI); |
185 | else // Legacy. Remove soon! | 185 | else // Legacy. Remove soon! |
186 | { | 186 | { |
187 | IConfig cfg = m_Config.Configs["LoginService"]; | 187 | IConfig cfg = m_Config.Configs["LoginService"]; |
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index 38629b2..f51c4ee 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |||
@@ -126,7 +126,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
126 | case "get_grid_extra_features": | 126 | case "get_grid_extra_features": |
127 | return GetGridExtraFeatures(request); | 127 | return GetGridExtraFeatures(request); |
128 | } | 128 | } |
129 | 129 | ||
130 | m_log.DebugFormat("[GRID HANDLER]: unknown method request {0}", method); | 130 | m_log.DebugFormat("[GRID HANDLER]: unknown method request {0}", method); |
131 | } | 131 | } |
132 | catch (Exception e) | 132 | catch (Exception e) |
@@ -590,22 +590,22 @@ namespace OpenSim.Server.Handlers.Grid | |||
590 | int flags = m_GridService.GetRegionFlags(scopeID, regionID); | 590 | int flags = m_GridService.GetRegionFlags(scopeID, regionID); |
591 | // m_log.DebugFormat("[GRID HANDLER]: flags for region {0}: {1}", regionID, flags); | 591 | // m_log.DebugFormat("[GRID HANDLER]: flags for region {0}: {1}", regionID, flags); |
592 | 592 | ||
593 | Dictionary<string, object> result = new Dictionary<string, object>(); | 593 | Dictionary<string, object> result = new Dictionary<string, object>(); |
594 | result["result"] = flags.ToString(); | 594 | result["result"] = flags.ToString(); |
595 | 595 | ||
596 | string xmlString = ServerUtils.BuildXmlResponse(result); | 596 | string xmlString = ServerUtils.BuildXmlResponse(result); |
597 | 597 | ||
598 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); | 598 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); |
599 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); | 599 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
600 | } | 600 | } |
601 | 601 | ||
602 | byte[] GetGridExtraFeatures(Dictionary<string, object> request) | 602 | byte[] GetGridExtraFeatures(Dictionary<string, object> request) |
603 | { | 603 | { |
604 | 604 | ||
605 | Dictionary<string, object> result = new Dictionary<string, object> (); | 605 | Dictionary<string, object> result = new Dictionary<string, object> (); |
606 | Dictionary<string, object> extraFeatures = m_GridService.GetExtraFeatures (); | 606 | Dictionary<string, object> extraFeatures = m_GridService.GetExtraFeatures (); |
607 | 607 | ||
608 | foreach (string key in extraFeatures.Keys) | 608 | foreach (string key in extraFeatures.Keys) |
609 | { | 609 | { |
610 | result [key] = extraFeatures [key]; | 610 | result [key] = extraFeatures [key]; |
611 | } | 611 | } |
diff --git a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs index f3d678f..684d1a8 100644 --- a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
52 | public class GatekeeperAgentHandler : OpenSim.Server.Handlers.Simulation.AgentPostHandler | 52 | public class GatekeeperAgentHandler : OpenSim.Server.Handlers.Simulation.AgentPostHandler |
53 | { | 53 | { |
54 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private IGatekeeperService m_GatekeeperService; | 56 | private IGatekeeperService m_GatekeeperService; |
57 | 57 | ||
58 | public GatekeeperAgentHandler(IGatekeeperService gatekeeper, bool proxy) : base("/foreignagent") | 58 | public GatekeeperAgentHandler(IGatekeeperService gatekeeper, bool proxy) : base("/foreignagent") |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs index 6c79c60..870a5ef 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendServerConnector.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
48 | } | 48 | } |
49 | 49 | ||
50 | // Called from standalone configurations | 50 | // Called from standalone configurations |
51 | public HGFriendsServerConnector(IConfigSource config, IHttpServer server, string configName, IFriendsSimConnector localConn) | 51 | public HGFriendsServerConnector(IConfigSource config, IHttpServer server, string configName, IFriendsSimConnector localConn) |
52 | : base(config, server, configName) | 52 | : base(config, server, configName) |
53 | { | 53 | { |
54 | if (configName != string.Empty) | 54 | if (configName != string.Empty) |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs index 37b47ed..8116050 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
61 | m_UserAgentService = uas; | 61 | m_UserAgentService = uas; |
62 | m_FriendsLocalSimConnector = friendsConn; | 62 | m_FriendsLocalSimConnector = friendsConn; |
63 | 63 | ||
64 | m_log.DebugFormat("[HGFRIENDS HANDLER]: HGFriendsServerPostHandler is On ({0})", | 64 | m_log.DebugFormat("[HGFRIENDS HANDLER]: HGFriendsServerPostHandler is On ({0})", |
65 | (m_FriendsLocalSimConnector == null ? "robust" : "standalone")); | 65 | (m_FriendsLocalSimConnector == null ? "robust" : "standalone")); |
66 | 66 | ||
67 | if (m_TheService == null) | 67 | if (m_TheService == null) |
@@ -105,24 +105,24 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
105 | 105 | ||
106 | case "validate_friendship_offered": | 106 | case "validate_friendship_offered": |
107 | return ValidateFriendshipOffered(request); | 107 | return ValidateFriendshipOffered(request); |
108 | 108 | ||
109 | case "statusnotification": | 109 | case "statusnotification": |
110 | return StatusNotification(request); | 110 | return StatusNotification(request); |
111 | /* | 111 | /* |
112 | case "friendship_approved": | 112 | case "friendship_approved": |
113 | return FriendshipApproved(request); | 113 | return FriendshipApproved(request); |
114 | 114 | ||
115 | case "friendship_denied": | 115 | case "friendship_denied": |
116 | return FriendshipDenied(request); | 116 | return FriendshipDenied(request); |
117 | 117 | ||
118 | case "friendship_terminated": | 118 | case "friendship_terminated": |
119 | return FriendshipTerminated(request); | 119 | return FriendshipTerminated(request); |
120 | 120 | ||
121 | case "grant_rights": | 121 | case "grant_rights": |
122 | return GrantRights(request); | 122 | return GrantRights(request); |
123 | */ | 123 | */ |
124 | } | 124 | } |
125 | 125 | ||
126 | m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0}", method); | 126 | m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0}", method); |
127 | } | 127 | } |
128 | catch (Exception e) | 128 | catch (Exception e) |
diff --git a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs index 8145a21..63f376d 100644 --- a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
55 | 55 | ||
56 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server) : | 56 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server) : |
57 | this(config, server, (IInstantMessageSimConnector)null) | 57 | this(config, server, (IInstantMessageSimConnector)null) |
58 | { | 58 | { |
59 | } | 59 | } |
60 | 60 | ||
61 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, string configName) : | 61 | public InstantMessageServerConnector(IConfigSource config, IHttpServer server, string configName) : |
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index 37feabe..394b133 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |||
@@ -63,14 +63,14 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
63 | 63 | ||
64 | public UserAgentServerConnector(IConfigSource config, IHttpServer server) : | 64 | public UserAgentServerConnector(IConfigSource config, IHttpServer server) : |
65 | this(config, server, (IFriendsSimConnector)null) | 65 | this(config, server, (IFriendsSimConnector)null) |
66 | { | 66 | { |
67 | } | 67 | } |
68 | 68 | ||
69 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, string configName) : | 69 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, string configName) : |
70 | this(config, server) | 70 | this(config, server) |
71 | { | 71 | { |
72 | } | 72 | } |
73 | 73 | ||
74 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) : | 74 | public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) : |
75 | base(config, server, String.Empty) | 75 | base(config, server, String.Empty) |
76 | { | 76 | { |
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs index 0bab5aa..e90b869 100644 --- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
61 | { | 61 | { |
62 | if (configName != string.Empty) | 62 | if (configName != string.Empty) |
63 | m_ConfigName = configName; | 63 | m_ConfigName = configName; |
64 | 64 | ||
65 | IConfig serverConfig = config.Configs[m_ConfigName]; | 65 | IConfig serverConfig = config.Configs[m_ConfigName]; |
66 | if (serverConfig == null) | 66 | if (serverConfig == null) |
67 | throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); | 67 | throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); |
@@ -92,7 +92,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
92 | m_httpServer.AddStreamHandler( | 92 | m_httpServer.AddStreamHandler( |
93 | new RestDeserialiseSecureHandler<Guid, InventoryCollection>( | 93 | new RestDeserialiseSecureHandler<Guid, InventoryCollection>( |
94 | "POST", "/GetFolderContent/", GetFolderContent, CheckAuthSession)); | 94 | "POST", "/GetFolderContent/", GetFolderContent, CheckAuthSession)); |
95 | 95 | ||
96 | m_httpServer.AddStreamHandler( | 96 | m_httpServer.AddStreamHandler( |
97 | new RestDeserialiseSecureHandler<InventoryFolderBase, bool>( | 97 | new RestDeserialiseSecureHandler<InventoryFolderBase, bool>( |
98 | "POST", "/UpdateFolder/", m_InventoryService.UpdateFolder, CheckAuthSession)); | 98 | "POST", "/UpdateFolder/", m_InventoryService.UpdateFolder, CheckAuthSession)); |
@@ -151,7 +151,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
151 | 151 | ||
152 | m_httpServer.AddStreamHandler(new InventoryServerMoveItemsHandler(m_InventoryService)); | 152 | m_httpServer.AddStreamHandler(new InventoryServerMoveItemsHandler(m_InventoryService)); |
153 | 153 | ||
154 | 154 | ||
155 | // for persistent active gestures | 155 | // for persistent active gestures |
156 | m_httpServer.AddStreamHandler( | 156 | m_httpServer.AddStreamHandler( |
157 | new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>> | 157 | new RestDeserialiseTrustedHandler<Guid, List<InventoryItemBase>> |
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index 96d6451..4400395 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
@@ -293,7 +293,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
293 | result["FID"] = icoll.FolderID.ToString(); | 293 | result["FID"] = icoll.FolderID.ToString(); |
294 | result["VERSION"] = icoll.Version.ToString(); | 294 | result["VERSION"] = icoll.Version.ToString(); |
295 | Dictionary<string, object> folders = new Dictionary<string, object>(); | 295 | Dictionary<string, object> folders = new Dictionary<string, object>(); |
296 | int i = 0; | 296 | int i = 0; |
297 | if (icoll.Folders != null) | 297 | if (icoll.Folders != null) |
298 | { | 298 | { |
299 | foreach (InventoryFolderBase f in icoll.Folders) | 299 | foreach (InventoryFolderBase f in icoll.Folders) |
@@ -407,7 +407,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
407 | } | 407 | } |
408 | } | 408 | } |
409 | result["ITEMS"] = sitems; | 409 | result["ITEMS"] = sitems; |
410 | 410 | ||
411 | string xmlString = ServerUtils.BuildXmlResponse(result); | 411 | string xmlString = ServerUtils.BuildXmlResponse(result); |
412 | 412 | ||
413 | //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); | 413 | //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString); |
diff --git a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs index d368bd3..c4b339f 100644 --- a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Land | |||
54 | m_log.Error("[LAND IN CONNECTOR]: Land service was not provided"); | 54 | m_log.Error("[LAND IN CONNECTOR]: Land service was not provided"); |
55 | return; | 55 | return; |
56 | } | 56 | } |
57 | 57 | ||
58 | //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false); | 58 | //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false); |
59 | //if (authentication) | 59 | //if (authentication) |
60 | // m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>(); | 60 | // m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>(); |
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs index 5d672c3..072429a 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Server.Handlers.Login | |||
53 | 53 | ||
54 | private ILoginService m_LocalService; | 54 | private ILoginService m_LocalService; |
55 | private bool m_Proxy; | 55 | private bool m_Proxy; |
56 | 56 | ||
57 | 57 | ||
58 | public LLLoginHandlers(ILoginService service, bool hasProxy) | 58 | public LLLoginHandlers(ILoginService service, bool hasProxy) |
59 | { | 59 | { |
@@ -136,7 +136,7 @@ namespace OpenSim.Server.Handlers.Login | |||
136 | bool LibOMVclient = false; | 136 | bool LibOMVclient = false; |
137 | if (request.Params.Count > 4 && (string)request.Params[4] == "gridproxy") | 137 | if (request.Params.Count > 4 && (string)request.Params[4] == "gridproxy") |
138 | LibOMVclient = true; | 138 | LibOMVclient = true; |
139 | 139 | ||
140 | LoginResponse reply = null; | 140 | LoginResponse reply = null; |
141 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient, LibOMVclient); | 141 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient, LibOMVclient); |
142 | 142 | ||
@@ -279,11 +279,11 @@ namespace OpenSim.Server.Handlers.Login | |||
279 | sock.Close("success"); | 279 | sock.Close("success"); |
280 | } | 280 | } |
281 | }; | 281 | }; |
282 | 282 | ||
283 | sock.HandshakeAndUpgrade(); | 283 | sock.HandshakeAndUpgrade(); |
284 | 284 | ||
285 | } | 285 | } |
286 | 286 | ||
287 | 287 | ||
288 | private XmlRpcResponse FailedXMLRPCResponse() | 288 | private XmlRpcResponse FailedXMLRPCResponse() |
289 | { | 289 | { |
diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs index f60e892..56ac3c2 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Server.Handlers.Login | |||
98 | m_DosProtectionOptions.ForgetTimeSpan = | 98 | m_DosProtectionOptions.ForgetTimeSpan = |
99 | TimeSpan.FromMilliseconds(serverConfig.GetInt("DOSForgiveClientAfterMS", 120000)); | 99 | TimeSpan.FromMilliseconds(serverConfig.GetInt("DOSForgiveClientAfterMS", 120000)); |
100 | m_DosProtectionOptions.ReportingName = "LOGINDOSPROTECTION"; | 100 | m_DosProtectionOptions.ReportingName = "LOGINDOSPROTECTION"; |
101 | 101 | ||
102 | 102 | ||
103 | return loginService; | 103 | return loginService; |
104 | } | 104 | } |
@@ -106,7 +106,7 @@ namespace OpenSim.Server.Handlers.Login | |||
106 | private void InitializeHandlers(IHttpServer server) | 106 | private void InitializeHandlers(IHttpServer server) |
107 | { | 107 | { |
108 | LLLoginHandlers loginHandlers = new LLLoginHandlers(m_LoginService, m_Proxy); | 108 | LLLoginHandlers loginHandlers = new LLLoginHandlers(m_LoginService, m_Proxy); |
109 | server.AddXmlRPCHandler("login_to_simulator", | 109 | server.AddXmlRPCHandler("login_to_simulator", |
110 | new XmlRpcBasicDOSProtector(loginHandlers.HandleXMLRPCLogin,loginHandlers.HandleXMLRPCLoginBlocked, | 110 | new XmlRpcBasicDOSProtector(loginHandlers.HandleXMLRPCLogin,loginHandlers.HandleXMLRPCLoginBlocked, |
111 | m_DosProtectionOptions).Process, false); | 111 | m_DosProtectionOptions).Process, false); |
112 | server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false); | 112 | server.AddXmlRPCHandler("set_login_level", loginHandlers.HandleXMLRPCSetLoginLevel, false); |
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs index 38dfffc..7611f53 100644 --- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |||
@@ -148,7 +148,7 @@ namespace OpenSim.Server.Handlers.MapImage | |||
148 | } | 148 | } |
149 | else | 149 | else |
150 | { | 150 | { |
151 | m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}", | 151 | m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}", |
152 | ipAddr, x, y); | 152 | ipAddr, x, y); |
153 | return FailureResult("Region not found at given coordinates"); | 153 | return FailureResult("Region not found at given coordinates"); |
154 | } | 154 | } |
diff --git a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs index 4f8f7e1..f292b95 100644 --- a/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs | |||
@@ -141,7 +141,7 @@ namespace OpenSim.Server.Handlers.MapImage | |||
141 | } | 141 | } |
142 | else | 142 | else |
143 | { | 143 | { |
144 | m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}", | 144 | m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}", |
145 | ipAddr, x, y); | 145 | ipAddr, x, y); |
146 | return FailureResult("Region not found at given coordinates"); | 146 | return FailureResult("Region not found at given coordinates"); |
147 | } | 147 | } |
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs index 3525a01..e3ee467 100644 --- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs +++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | |||
@@ -150,7 +150,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
150 | 150 | ||
151 | // Finally! | 151 | // Finally! |
152 | GridRegion thisRegion = m_NeighbourService.HelloNeighbour(regionhandle, aRegion); | 152 | GridRegion thisRegion = m_NeighbourService.HelloNeighbour(regionhandle, aRegion); |
153 | 153 | ||
154 | OSDMap resp = new OSDMap(1); | 154 | OSDMap resp = new OSDMap(1); |
155 | 155 | ||
156 | if (thisRegion != null) | 156 | if (thisRegion != null) |
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs index ac2e75f..65ac4e6 100644 --- a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
55 | m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided"); | 55 | m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided"); |
56 | return; | 56 | return; |
57 | } | 57 | } |
58 | 58 | ||
59 | //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false); | 59 | //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false); |
60 | //if (authentication) | 60 | //if (authentication) |
61 | // m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>(); | 61 | // m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>(); |
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs index 49dbcb5..be16e17 100644 --- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs | |||
@@ -158,7 +158,7 @@ namespace OpenSim.Server.Handlers.Presence | |||
158 | 158 | ||
159 | return FailureResult(); | 159 | return FailureResult(); |
160 | } | 160 | } |
161 | 161 | ||
162 | byte[] Report(Dictionary<string, object> request) | 162 | byte[] Report(Dictionary<string, object> request) |
163 | { | 163 | { |
164 | UUID session = UUID.Zero; | 164 | UUID session = UUID.Zero; |
@@ -241,7 +241,7 @@ namespace OpenSim.Server.Handlers.Presence | |||
241 | } | 241 | } |
242 | 242 | ||
243 | string xmlString = ServerUtils.BuildXmlResponse(result); | 243 | string xmlString = ServerUtils.BuildXmlResponse(result); |
244 | 244 | ||
245 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); | 245 | //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString); |
246 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); | 246 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
247 | } | 247 | } |
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs index 2dfb862..eecb370 100644 --- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs +++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs | |||
@@ -39,8 +39,8 @@ namespace OpenSim.Server.Handlers.Profiles | |||
39 | { | 39 | { |
40 | public class UserProfilesConnector: ServiceConnector | 40 | public class UserProfilesConnector: ServiceConnector |
41 | { | 41 | { |
42 | // static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | // static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | // Our Local Module | 44 | // Our Local Module |
45 | public IUserProfilesService ServiceModule | 45 | public IUserProfilesService ServiceModule |
46 | { | 46 | { |
@@ -83,7 +83,7 @@ namespace OpenSim.Server.Handlers.Profiles | |||
83 | 83 | ||
84 | Object[] args = new Object[] { config, ConfigName }; | 84 | Object[] args = new Object[] { config, ConfigName }; |
85 | ServiceModule = ServerUtils.LoadPlugin<IUserProfilesService>(service, args); | 85 | ServiceModule = ServerUtils.LoadPlugin<IUserProfilesService>(service, args); |
86 | 86 | ||
87 | JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule); | 87 | JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule); |
88 | 88 | ||
89 | Server.AddJsonRPCHandler("avatarclassifiedsrequest", handler.AvatarClassifiedsRequest); | 89 | Server.AddJsonRPCHandler("avatarclassifiedsrequest", handler.AvatarClassifiedsRequest); |
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs index cac38f5..f23a981 100644 --- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs +++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | |||
@@ -48,17 +48,17 @@ namespace OpenSim.Server.Handlers | |||
48 | static readonly ILog m_log = | 48 | static readonly ILog m_log = |
49 | LogManager.GetLogger( | 49 | LogManager.GetLogger( |
50 | MethodBase.GetCurrentMethod().DeclaringType); | 50 | MethodBase.GetCurrentMethod().DeclaringType); |
51 | 51 | ||
52 | public IUserProfilesService Service | 52 | public IUserProfilesService Service |
53 | { | 53 | { |
54 | get; private set; | 54 | get; private set; |
55 | } | 55 | } |
56 | 56 | ||
57 | public JsonRpcProfileHandlers(IUserProfilesService service) | 57 | public JsonRpcProfileHandlers(IUserProfilesService service) |
58 | { | 58 | { |
59 | Service = service; | 59 | Service = service; |
60 | } | 60 | } |
61 | 61 | ||
62 | #region Classifieds | 62 | #region Classifieds |
63 | /// <summary> | 63 | /// <summary> |
64 | /// Request avatar's classified ads. | 64 | /// Request avatar's classified ads. |
@@ -80,17 +80,17 @@ namespace OpenSim.Server.Handlers | |||
80 | m_log.DebugFormat ("Classified Request"); | 80 | m_log.DebugFormat ("Classified Request"); |
81 | return false; | 81 | return false; |
82 | } | 82 | } |
83 | 83 | ||
84 | OSDMap request = (OSDMap)json["params"]; | 84 | OSDMap request = (OSDMap)json["params"]; |
85 | UUID creatorId = new UUID(request["creatorId"].AsString()); | 85 | UUID creatorId = new UUID(request["creatorId"].AsString()); |
86 | 86 | ||
87 | 87 | ||
88 | OSDArray data = (OSDArray) Service.AvatarClassifiedsRequest(creatorId); | 88 | OSDArray data = (OSDArray) Service.AvatarClassifiedsRequest(creatorId); |
89 | response.Result = data; | 89 | response.Result = data; |
90 | 90 | ||
91 | return true; | 91 | return true; |
92 | } | 92 | } |
93 | 93 | ||
94 | public bool ClassifiedUpdate(OSDMap json, ref JsonRpcResponse response) | 94 | public bool ClassifiedUpdate(OSDMap json, ref JsonRpcResponse response) |
95 | { | 95 | { |
96 | if(!json.ContainsKey("params")) | 96 | if(!json.ContainsKey("params")) |
@@ -100,7 +100,7 @@ namespace OpenSim.Server.Handlers | |||
100 | m_log.DebugFormat ("Classified Update Request"); | 100 | m_log.DebugFormat ("Classified Update Request"); |
101 | return false; | 101 | return false; |
102 | } | 102 | } |
103 | 103 | ||
104 | string result = string.Empty; | 104 | string result = string.Empty; |
105 | UserClassifiedAdd ad = new UserClassifiedAdd(); | 105 | UserClassifiedAdd ad = new UserClassifiedAdd(); |
106 | object Ad = (object)ad; | 106 | object Ad = (object)ad; |
@@ -110,12 +110,12 @@ namespace OpenSim.Server.Handlers | |||
110 | response.Result = OSD.SerializeMembers(ad); | 110 | response.Result = OSD.SerializeMembers(ad); |
111 | return true; | 111 | return true; |
112 | } | 112 | } |
113 | 113 | ||
114 | response.Error.Code = ErrorCode.InternalError; | 114 | response.Error.Code = ErrorCode.InternalError; |
115 | response.Error.Message = string.Format("{0}", result); | 115 | response.Error.Message = string.Format("{0}", result); |
116 | return false; | 116 | return false; |
117 | } | 117 | } |
118 | 118 | ||
119 | public bool ClassifiedDelete(OSDMap json, ref JsonRpcResponse response) | 119 | public bool ClassifiedDelete(OSDMap json, ref JsonRpcResponse response) |
120 | { | 120 | { |
121 | if(!json.ContainsKey("params")) | 121 | if(!json.ContainsKey("params")) |
@@ -124,10 +124,10 @@ namespace OpenSim.Server.Handlers | |||
124 | m_log.DebugFormat ("Classified Delete Request"); | 124 | m_log.DebugFormat ("Classified Delete Request"); |
125 | return false; | 125 | return false; |
126 | } | 126 | } |
127 | 127 | ||
128 | OSDMap request = (OSDMap)json["params"]; | 128 | OSDMap request = (OSDMap)json["params"]; |
129 | UUID classifiedId = new UUID(request["classifiedId"].AsString()); | 129 | UUID classifiedId = new UUID(request["classifiedId"].AsString()); |
130 | 130 | ||
131 | if (Service.ClassifiedDelete(classifiedId)) | 131 | if (Service.ClassifiedDelete(classifiedId)) |
132 | return true; | 132 | return true; |
133 | 133 | ||
@@ -135,7 +135,7 @@ namespace OpenSim.Server.Handlers | |||
135 | response.Error.Message = "data error removing record"; | 135 | response.Error.Message = "data error removing record"; |
136 | return false; | 136 | return false; |
137 | } | 137 | } |
138 | 138 | ||
139 | public bool ClassifiedInfoRequest(OSDMap json, ref JsonRpcResponse response) | 139 | public bool ClassifiedInfoRequest(OSDMap json, ref JsonRpcResponse response) |
140 | { | 140 | { |
141 | if(!json.ContainsKey("params")) | 141 | if(!json.ContainsKey("params")) |
@@ -145,7 +145,7 @@ namespace OpenSim.Server.Handlers | |||
145 | m_log.DebugFormat ("Classified Info Request"); | 145 | m_log.DebugFormat ("Classified Info Request"); |
146 | return false; | 146 | return false; |
147 | } | 147 | } |
148 | 148 | ||
149 | string result = string.Empty; | 149 | string result = string.Empty; |
150 | UserClassifiedAdd ad = new UserClassifiedAdd(); | 150 | UserClassifiedAdd ad = new UserClassifiedAdd(); |
151 | object Ad = (object)ad; | 151 | object Ad = (object)ad; |
@@ -155,13 +155,13 @@ namespace OpenSim.Server.Handlers | |||
155 | response.Result = OSD.SerializeMembers(ad); | 155 | response.Result = OSD.SerializeMembers(ad); |
156 | return true; | 156 | return true; |
157 | } | 157 | } |
158 | 158 | ||
159 | response.Error.Code = ErrorCode.InternalError; | 159 | response.Error.Code = ErrorCode.InternalError; |
160 | response.Error.Message = string.Format("{0}", result); | 160 | response.Error.Message = string.Format("{0}", result); |
161 | return false; | 161 | return false; |
162 | } | 162 | } |
163 | #endregion Classifieds | 163 | #endregion Classifieds |
164 | 164 | ||
165 | #region Picks | 165 | #region Picks |
166 | public bool AvatarPicksRequest(OSDMap json, ref JsonRpcResponse response) | 166 | public bool AvatarPicksRequest(OSDMap json, ref JsonRpcResponse response) |
167 | { | 167 | { |
@@ -171,17 +171,17 @@ namespace OpenSim.Server.Handlers | |||
171 | m_log.DebugFormat ("Avatar Picks Request"); | 171 | m_log.DebugFormat ("Avatar Picks Request"); |
172 | return false; | 172 | return false; |
173 | } | 173 | } |
174 | 174 | ||
175 | OSDMap request = (OSDMap)json["params"]; | 175 | OSDMap request = (OSDMap)json["params"]; |
176 | UUID creatorId = new UUID(request["creatorId"].AsString()); | 176 | UUID creatorId = new UUID(request["creatorId"].AsString()); |
177 | 177 | ||
178 | 178 | ||
179 | OSDArray data = (OSDArray) Service.AvatarPicksRequest(creatorId); | 179 | OSDArray data = (OSDArray) Service.AvatarPicksRequest(creatorId); |
180 | response.Result = data; | 180 | response.Result = data; |
181 | 181 | ||
182 | return true; | 182 | return true; |
183 | } | 183 | } |
184 | 184 | ||
185 | public bool PickInfoRequest(OSDMap json, ref JsonRpcResponse response) | 185 | public bool PickInfoRequest(OSDMap json, ref JsonRpcResponse response) |
186 | { | 186 | { |
187 | if(!json.ContainsKey("params")) | 187 | if(!json.ContainsKey("params")) |
@@ -191,7 +191,7 @@ namespace OpenSim.Server.Handlers | |||
191 | m_log.DebugFormat ("Avatar Picks Info Request"); | 191 | m_log.DebugFormat ("Avatar Picks Info Request"); |
192 | return false; | 192 | return false; |
193 | } | 193 | } |
194 | 194 | ||
195 | string result = string.Empty; | 195 | string result = string.Empty; |
196 | UserProfilePick pick = new UserProfilePick(); | 196 | UserProfilePick pick = new UserProfilePick(); |
197 | object Pick = (object)pick; | 197 | object Pick = (object)pick; |
@@ -201,12 +201,12 @@ namespace OpenSim.Server.Handlers | |||
201 | response.Result = OSD.SerializeMembers(pick); | 201 | response.Result = OSD.SerializeMembers(pick); |
202 | return true; | 202 | return true; |
203 | } | 203 | } |
204 | 204 | ||
205 | response.Error.Code = ErrorCode.InternalError; | 205 | response.Error.Code = ErrorCode.InternalError; |
206 | response.Error.Message = string.Format("{0}", result); | 206 | response.Error.Message = string.Format("{0}", result); |
207 | return false; | 207 | return false; |
208 | } | 208 | } |
209 | 209 | ||
210 | public bool PicksUpdate(OSDMap json, ref JsonRpcResponse response) | 210 | public bool PicksUpdate(OSDMap json, ref JsonRpcResponse response) |
211 | { | 211 | { |
212 | if(!json.ContainsKey("params")) | 212 | if(!json.ContainsKey("params")) |
@@ -216,7 +216,7 @@ namespace OpenSim.Server.Handlers | |||
216 | m_log.DebugFormat ("Avatar Picks Update Request"); | 216 | m_log.DebugFormat ("Avatar Picks Update Request"); |
217 | return false; | 217 | return false; |
218 | } | 218 | } |
219 | 219 | ||
220 | string result = string.Empty; | 220 | string result = string.Empty; |
221 | UserProfilePick pick = new UserProfilePick(); | 221 | UserProfilePick pick = new UserProfilePick(); |
222 | object Pick = (object)pick; | 222 | object Pick = (object)pick; |
@@ -226,13 +226,13 @@ namespace OpenSim.Server.Handlers | |||
226 | response.Result = OSD.SerializeMembers(pick); | 226 | response.Result = OSD.SerializeMembers(pick); |
227 | return true; | 227 | return true; |
228 | } | 228 | } |
229 | 229 | ||
230 | response.Error.Code = ErrorCode.InternalError; | 230 | response.Error.Code = ErrorCode.InternalError; |
231 | response.Error.Message = "unable to update pick"; | 231 | response.Error.Message = "unable to update pick"; |
232 | 232 | ||
233 | return false; | 233 | return false; |
234 | } | 234 | } |
235 | 235 | ||
236 | public bool PicksDelete(OSDMap json, ref JsonRpcResponse response) | 236 | public bool PicksDelete(OSDMap json, ref JsonRpcResponse response) |
237 | { | 237 | { |
238 | if(!json.ContainsKey("params")) | 238 | if(!json.ContainsKey("params")) |
@@ -241,18 +241,18 @@ namespace OpenSim.Server.Handlers | |||
241 | m_log.DebugFormat ("Avatar Picks Delete Request"); | 241 | m_log.DebugFormat ("Avatar Picks Delete Request"); |
242 | return false; | 242 | return false; |
243 | } | 243 | } |
244 | 244 | ||
245 | OSDMap request = (OSDMap)json["params"]; | 245 | OSDMap request = (OSDMap)json["params"]; |
246 | UUID pickId = new UUID(request["pickId"].AsString()); | 246 | UUID pickId = new UUID(request["pickId"].AsString()); |
247 | if(Service.PicksDelete(pickId)) | 247 | if(Service.PicksDelete(pickId)) |
248 | return true; | 248 | return true; |
249 | 249 | ||
250 | response.Error.Code = ErrorCode.InternalError; | 250 | response.Error.Code = ErrorCode.InternalError; |
251 | response.Error.Message = "data error removing record"; | 251 | response.Error.Message = "data error removing record"; |
252 | return false; | 252 | return false; |
253 | } | 253 | } |
254 | #endregion Picks | 254 | #endregion Picks |
255 | 255 | ||
256 | #region Notes | 256 | #region Notes |
257 | public bool AvatarNotesRequest(OSDMap json, ref JsonRpcResponse response) | 257 | public bool AvatarNotesRequest(OSDMap json, ref JsonRpcResponse response) |
258 | { | 258 | { |
@@ -277,7 +277,7 @@ namespace OpenSim.Server.Handlers | |||
277 | response.Error.Message = "Error reading notes"; | 277 | response.Error.Message = "Error reading notes"; |
278 | return false; | 278 | return false; |
279 | } | 279 | } |
280 | 280 | ||
281 | public bool NotesUpdate(OSDMap json, ref JsonRpcResponse response) | 281 | public bool NotesUpdate(OSDMap json, ref JsonRpcResponse response) |
282 | { | 282 | { |
283 | if(!json.ContainsKey("params")) | 283 | if(!json.ContainsKey("params")) |
@@ -287,7 +287,7 @@ namespace OpenSim.Server.Handlers | |||
287 | m_log.DebugFormat ("Avatar Notes Update Request"); | 287 | m_log.DebugFormat ("Avatar Notes Update Request"); |
288 | return false; | 288 | return false; |
289 | } | 289 | } |
290 | 290 | ||
291 | string result = string.Empty; | 291 | string result = string.Empty; |
292 | UserProfileNotes note = new UserProfileNotes(); | 292 | UserProfileNotes note = new UserProfileNotes(); |
293 | object Notes = (object) note; | 293 | object Notes = (object) note; |
@@ -300,7 +300,7 @@ namespace OpenSim.Server.Handlers | |||
300 | return true; | 300 | return true; |
301 | } | 301 | } |
302 | #endregion Notes | 302 | #endregion Notes |
303 | 303 | ||
304 | #region Profile Properties | 304 | #region Profile Properties |
305 | public bool AvatarPropertiesRequest(OSDMap json, ref JsonRpcResponse response) | 305 | public bool AvatarPropertiesRequest(OSDMap json, ref JsonRpcResponse response) |
306 | { | 306 | { |
@@ -311,7 +311,7 @@ namespace OpenSim.Server.Handlers | |||
311 | m_log.DebugFormat ("Avatar Properties Request"); | 311 | m_log.DebugFormat ("Avatar Properties Request"); |
312 | return false; | 312 | return false; |
313 | } | 313 | } |
314 | 314 | ||
315 | string result = string.Empty; | 315 | string result = string.Empty; |
316 | UserProfileProperties props = new UserProfileProperties(); | 316 | UserProfileProperties props = new UserProfileProperties(); |
317 | object Props = (object)props; | 317 | object Props = (object)props; |
@@ -321,12 +321,12 @@ namespace OpenSim.Server.Handlers | |||
321 | response.Result = OSD.SerializeMembers(props); | 321 | response.Result = OSD.SerializeMembers(props); |
322 | return true; | 322 | return true; |
323 | } | 323 | } |
324 | 324 | ||
325 | response.Error.Code = ErrorCode.InternalError; | 325 | response.Error.Code = ErrorCode.InternalError; |
326 | response.Error.Message = string.Format("{0}", result); | 326 | response.Error.Message = string.Format("{0}", result); |
327 | return false; | 327 | return false; |
328 | } | 328 | } |
329 | 329 | ||
330 | public bool AvatarPropertiesUpdate(OSDMap json, ref JsonRpcResponse response) | 330 | public bool AvatarPropertiesUpdate(OSDMap json, ref JsonRpcResponse response) |
331 | { | 331 | { |
332 | if(!json.ContainsKey("params")) | 332 | if(!json.ContainsKey("params")) |
@@ -336,7 +336,7 @@ namespace OpenSim.Server.Handlers | |||
336 | m_log.DebugFormat ("Avatar Properties Update Request"); | 336 | m_log.DebugFormat ("Avatar Properties Update Request"); |
337 | return false; | 337 | return false; |
338 | } | 338 | } |
339 | 339 | ||
340 | string result = string.Empty; | 340 | string result = string.Empty; |
341 | UserProfileProperties props = new UserProfileProperties(); | 341 | UserProfileProperties props = new UserProfileProperties(); |
342 | object Props = (object)props; | 342 | object Props = (object)props; |
@@ -346,13 +346,13 @@ namespace OpenSim.Server.Handlers | |||
346 | response.Result = OSD.SerializeMembers(props); | 346 | response.Result = OSD.SerializeMembers(props); |
347 | return true; | 347 | return true; |
348 | } | 348 | } |
349 | 349 | ||
350 | response.Error.Code = ErrorCode.InternalError; | 350 | response.Error.Code = ErrorCode.InternalError; |
351 | response.Error.Message = string.Format("{0}", result); | 351 | response.Error.Message = string.Format("{0}", result); |
352 | return false; | 352 | return false; |
353 | } | 353 | } |
354 | #endregion Profile Properties | 354 | #endregion Profile Properties |
355 | 355 | ||
356 | #region Interests | 356 | #region Interests |
357 | public bool AvatarInterestsUpdate(OSDMap json, ref JsonRpcResponse response) | 357 | public bool AvatarInterestsUpdate(OSDMap json, ref JsonRpcResponse response) |
358 | { | 358 | { |
@@ -363,7 +363,7 @@ namespace OpenSim.Server.Handlers | |||
363 | m_log.DebugFormat ("Avatar Interests Update Request"); | 363 | m_log.DebugFormat ("Avatar Interests Update Request"); |
364 | return false; | 364 | return false; |
365 | } | 365 | } |
366 | 366 | ||
367 | string result = string.Empty; | 367 | string result = string.Empty; |
368 | UserProfileProperties props = new UserProfileProperties(); | 368 | UserProfileProperties props = new UserProfileProperties(); |
369 | object Props = (object)props; | 369 | object Props = (object)props; |
@@ -373,7 +373,7 @@ namespace OpenSim.Server.Handlers | |||
373 | response.Result = OSD.SerializeMembers(props); | 373 | response.Result = OSD.SerializeMembers(props); |
374 | return true; | 374 | return true; |
375 | } | 375 | } |
376 | 376 | ||
377 | response.Error.Code = ErrorCode.InternalError; | 377 | response.Error.Code = ErrorCode.InternalError; |
378 | response.Error.Message = string.Format("{0}", result); | 378 | response.Error.Message = string.Format("{0}", result); |
379 | return false; | 379 | return false; |
@@ -399,7 +399,7 @@ namespace OpenSim.Server.Handlers | |||
399 | response.Result = OSD.SerializeMembers(prefs); | 399 | response.Result = OSD.SerializeMembers(prefs); |
400 | return true; | 400 | return true; |
401 | } | 401 | } |
402 | 402 | ||
403 | response.Error.Code = ErrorCode.InternalError; | 403 | response.Error.Code = ErrorCode.InternalError; |
404 | response.Error.Message = string.Format("{0}", result); | 404 | response.Error.Message = string.Format("{0}", result); |
405 | // m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message); | 405 | // m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message); |
@@ -415,7 +415,7 @@ namespace OpenSim.Server.Handlers | |||
415 | m_log.DebugFormat ("User Preferences Update Request"); | 415 | m_log.DebugFormat ("User Preferences Update Request"); |
416 | return false; | 416 | return false; |
417 | } | 417 | } |
418 | 418 | ||
419 | string result = string.Empty; | 419 | string result = string.Empty; |
420 | UserPreferences prefs = new UserPreferences(); | 420 | UserPreferences prefs = new UserPreferences(); |
421 | object Prefs = (object)prefs; | 421 | object Prefs = (object)prefs; |
@@ -425,7 +425,7 @@ namespace OpenSim.Server.Handlers | |||
425 | response.Result = OSD.SerializeMembers(prefs); | 425 | response.Result = OSD.SerializeMembers(prefs); |
426 | return true; | 426 | return true; |
427 | } | 427 | } |
428 | 428 | ||
429 | response.Error.Code = ErrorCode.InternalError; | 429 | response.Error.Code = ErrorCode.InternalError; |
430 | response.Error.Message = string.Format("{0}", result); | 430 | response.Error.Message = string.Format("{0}", result); |
431 | m_log.InfoFormat("[PROFILES]: User preferences update error - {0}", response.Error.Message); | 431 | m_log.InfoFormat("[PROFILES]: User preferences update error - {0}", response.Error.Message); |
@@ -443,13 +443,13 @@ namespace OpenSim.Server.Handlers | |||
443 | m_log.DebugFormat ("Avatar Image Assets Request"); | 443 | m_log.DebugFormat ("Avatar Image Assets Request"); |
444 | return false; | 444 | return false; |
445 | } | 445 | } |
446 | 446 | ||
447 | OSDMap request = (OSDMap)json["params"]; | 447 | OSDMap request = (OSDMap)json["params"]; |
448 | UUID avatarId = new UUID(request["avatarId"].AsString()); | 448 | UUID avatarId = new UUID(request["avatarId"].AsString()); |
449 | 449 | ||
450 | OSDArray data = (OSDArray) Service.AvatarImageAssetsRequest(avatarId); | 450 | OSDArray data = (OSDArray) Service.AvatarImageAssetsRequest(avatarId); |
451 | response.Result = data; | 451 | response.Result = data; |
452 | 452 | ||
453 | return true; | 453 | return true; |
454 | } | 454 | } |
455 | #endregion Utiltiy | 455 | #endregion Utiltiy |
@@ -464,7 +464,7 @@ namespace OpenSim.Server.Handlers | |||
464 | m_log.DebugFormat ("User Application Service URL Request: No Parameters!"); | 464 | m_log.DebugFormat ("User Application Service URL Request: No Parameters!"); |
465 | return false; | 465 | return false; |
466 | } | 466 | } |
467 | 467 | ||
468 | string result = string.Empty; | 468 | string result = string.Empty; |
469 | UserAppData props = new UserAppData(); | 469 | UserAppData props = new UserAppData(); |
470 | object Props = (object)props; | 470 | object Props = (object)props; |
@@ -475,15 +475,15 @@ namespace OpenSim.Server.Handlers | |||
475 | res["result"] = OSD.FromString("success"); | 475 | res["result"] = OSD.FromString("success"); |
476 | res["token"] = OSD.FromString (result); | 476 | res["token"] = OSD.FromString (result); |
477 | response.Result = res; | 477 | response.Result = res; |
478 | 478 | ||
479 | return true; | 479 | return true; |
480 | } | 480 | } |
481 | 481 | ||
482 | response.Error.Code = ErrorCode.InternalError; | 482 | response.Error.Code = ErrorCode.InternalError; |
483 | response.Error.Message = string.Format("{0}", result); | 483 | response.Error.Message = string.Format("{0}", result); |
484 | return false; | 484 | return false; |
485 | } | 485 | } |
486 | 486 | ||
487 | public bool UpdateUserAppData(OSDMap json, ref JsonRpcResponse response) | 487 | public bool UpdateUserAppData(OSDMap json, ref JsonRpcResponse response) |
488 | { | 488 | { |
489 | if(!json.ContainsKey("params")) | 489 | if(!json.ContainsKey("params")) |
@@ -493,7 +493,7 @@ namespace OpenSim.Server.Handlers | |||
493 | m_log.DebugFormat ("User App Data Update Request"); | 493 | m_log.DebugFormat ("User App Data Update Request"); |
494 | return false; | 494 | return false; |
495 | } | 495 | } |
496 | 496 | ||
497 | string result = string.Empty; | 497 | string result = string.Empty; |
498 | UserAppData props = new UserAppData(); | 498 | UserAppData props = new UserAppData(); |
499 | object Props = (object)props; | 499 | object Props = (object)props; |
@@ -503,7 +503,7 @@ namespace OpenSim.Server.Handlers | |||
503 | response.Result = OSD.SerializeMembers(props); | 503 | response.Result = OSD.SerializeMembers(props); |
504 | return true; | 504 | return true; |
505 | } | 505 | } |
506 | 506 | ||
507 | response.Error.Code = ErrorCode.InternalError; | 507 | response.Error.Code = ErrorCode.InternalError; |
508 | response.Error.Message = string.Format("{0}", result); | 508 | response.Error.Message = string.Format("{0}", result); |
509 | return false; | 509 | return false; |
diff --git a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs index 7d3665b..4d6402f 100644 --- a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs +++ b/OpenSim/Server/Handlers/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.Server.Handlers")] | 8 | [assembly: AssemblyTitle("OpenSim.Server.Handlers")] |
@@ -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/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 364f1fd..4e1f72e 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -190,7 +190,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
190 | { | 190 | { |
191 | // If there is no version in the packet at all we're looking at 0.6 or | 191 | // If there is no version in the packet at all we're looking at 0.6 or |
192 | // even more ancient. Refuse it. | 192 | // even more ancient. Refuse it. |
193 | if(theirVersion == 0f) | 193 | if(theirVersion == 0f) |
194 | { | 194 | { |
195 | resp["success"] = OSD.FromBoolean(false); | 195 | resp["success"] = OSD.FromBoolean(false); |
196 | resp["reason"] = OSD.FromString("Your region is running a old version of opensim no longer supported. Consider updating it"); | 196 | resp["reason"] = OSD.FromString("Your region is running a old version of opensim no longer supported. Consider updating it"); |
@@ -199,8 +199,8 @@ namespace OpenSim.Server.Handlers.Simulation | |||
199 | } | 199 | } |
200 | 200 | ||
201 | version = theirVersion; | 201 | version = theirVersion; |
202 | 202 | ||
203 | if (version < VersionInfo.SimulationServiceVersionAcceptedMin || | 203 | if (version < VersionInfo.SimulationServiceVersionAcceptedMin || |
204 | version > VersionInfo.SimulationServiceVersionAcceptedMax ) | 204 | version > VersionInfo.SimulationServiceVersionAcceptedMax ) |
205 | { | 205 | { |
206 | resp["success"] = OSD.FromBoolean(false); | 206 | resp["success"] = OSD.FromBoolean(false); |
@@ -274,7 +274,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
274 | OSDArray featuresWanted = new OSDArray(); | 274 | OSDArray featuresWanted = new OSDArray(); |
275 | foreach (UUID feature in features) | 275 | foreach (UUID feature in features) |
276 | featuresWanted.Add(OSD.FromString(feature.ToString())); | 276 | featuresWanted.Add(OSD.FromString(feature.ToString())); |
277 | 277 | ||
278 | resp["features"] = featuresWanted; | 278 | resp["features"] = featuresWanted; |
279 | 279 | ||
280 | // We must preserve defaults here, otherwise a false "success" will not be put into the JSON map! | 280 | // We must preserve defaults here, otherwise a false "success" will not be put into the JSON map! |
@@ -460,7 +460,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
460 | source.RegionLocY = Int32.Parse(args["source_y"].AsString()); | 460 | source.RegionLocY = Int32.Parse(args["source_y"].AsString()); |
461 | source.RegionName = args["source_name"].AsString(); | 461 | source.RegionName = args["source_name"].AsString(); |
462 | source.RegionID = UUID.Parse(args["source_uuid"].AsString()); | 462 | source.RegionID = UUID.Parse(args["source_uuid"].AsString()); |
463 | 463 | ||
464 | if (args.ContainsKey("source_server_uri")) | 464 | if (args.ContainsKey("source_server_uri")) |
465 | source.RawServerURI = args["source_server_uri"].AsString(); | 465 | source.RawServerURI = args["source_server_uri"].AsString(); |
466 | else | 466 | else |