diff options
author | Jeff Ames | 2008-05-25 23:27:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-25 23:27:38 +0000 |
commit | 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch) | |
tree | b010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Grid | |
parent | * A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff) | |
download | opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2 opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/AssetServer/RestService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 8 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 9 |
5 files changed, 17 insertions, 12 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index c776c36..e0e5656 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Grid.AssetServer | |||
60 | m_assetProvider = assetProvider; | 60 | m_assetProvider = assetProvider; |
61 | } | 61 | } |
62 | 62 | ||
63 | public override byte[] Handle(string path, Stream request, | 63 | public override byte[] Handle(string path, Stream request, |
64 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 64 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
65 | { | 65 | { |
66 | string param = GetParam(path); | 66 | string param = GetParam(path); |
@@ -123,7 +123,7 @@ namespace OpenSim.Grid.AssetServer | |||
123 | private OpenAsset_Main m_assetManager; | 123 | private OpenAsset_Main m_assetManager; |
124 | private IAssetProvider m_assetProvider; | 124 | private IAssetProvider m_assetProvider; |
125 | 125 | ||
126 | public override byte[] Handle(string path, Stream request, | 126 | public override byte[] Handle(string path, Stream request, |
127 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 127 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
128 | { | 128 | { |
129 | string param = GetParam(path); | 129 | string param = GetParam(path); |
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 5a6a328..d0eec32 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -880,7 +880,7 @@ namespace OpenSim.Grid.GridServer | |||
880 | /// <param name="httpRequest">HTTP request header object</param> | 880 | /// <param name="httpRequest">HTTP request header object</param> |
881 | /// <param name="httpResponse">HTTP response header object</param> | 881 | /// <param name="httpResponse">HTTP response header object</param> |
882 | /// <returns></returns> | 882 | /// <returns></returns> |
883 | public string RestGetRegionMethod(string request, string path, string param, | 883 | public string RestGetRegionMethod(string request, string path, string param, |
884 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 884 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
885 | { | 885 | { |
886 | return RestGetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); | 886 | return RestGetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); |
@@ -895,7 +895,7 @@ namespace OpenSim.Grid.GridServer | |||
895 | /// <param name="httpRequest">HTTP request header object</param> | 895 | /// <param name="httpRequest">HTTP request header object</param> |
896 | /// <param name="httpResponse">HTTP response header object</param> | 896 | /// <param name="httpResponse">HTTP response header object</param> |
897 | /// <returns></returns> | 897 | /// <returns></returns> |
898 | public string RestSetRegionMethod(string request, string path, string param, | 898 | public string RestSetRegionMethod(string request, string path, string param, |
899 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 899 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
900 | { | 900 | { |
901 | return RestSetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); | 901 | return RestSetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); |
@@ -910,7 +910,7 @@ namespace OpenSim.Grid.GridServer | |||
910 | /// <param name="httpRequest">HTTP request header object</param> | 910 | /// <param name="httpRequest">HTTP request header object</param> |
911 | /// <param name="httpResponse">HTTP response header object</param> | 911 | /// <param name="httpResponse">HTTP response header object</param> |
912 | /// <returns>Information about the sim in XML</returns> | 912 | /// <returns>Information about the sim in XML</returns> |
913 | public string RestGetSimMethod(string request, string path, string param, | 913 | public string RestGetSimMethod(string request, string path, string param, |
914 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 914 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
915 | { | 915 | { |
916 | string respstring = String.Empty; | 916 | string respstring = String.Empty; |
@@ -958,7 +958,7 @@ namespace OpenSim.Grid.GridServer | |||
958 | /// <param name="httpRequest">HTTP request header object</param> | 958 | /// <param name="httpRequest">HTTP request header object</param> |
959 | /// <param name="httpResponse">HTTP response header object</param> | 959 | /// <param name="httpResponse">HTTP response header object</param> |
960 | /// <returns>"OK" or an error</returns> | 960 | /// <returns>"OK" or an error</returns> |
961 | public string RestSetSimMethod(string request, string path, string param, | 961 | public string RestSetSimMethod(string request, string path, string param, |
962 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 962 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
963 | { | 963 | { |
964 | Console.WriteLine("Processing region update via REST method"); | 964 | Console.WriteLine("Processing region update via REST method"); |
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs index a5b256d..efe077d 100644 --- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs +++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.MessagingServer | |||
52 | 52 | ||
53 | } | 53 | } |
54 | 54 | ||
55 | public override byte[] Handle(string path, Stream request, | 55 | public override byte[] Handle(string path, Stream request, |
56 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 56 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
57 | { | 57 | { |
58 | string param = GetParam(path); | 58 | string param = GetParam(path); |
@@ -86,7 +86,7 @@ namespace OpenSim.Grid.MessagingServer | |||
86 | { | 86 | { |
87 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 87 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
88 | 88 | ||
89 | public override byte[] Handle(string path, Stream request, | 89 | public override byte[] Handle(string path, Stream request, |
90 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 90 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
91 | { | 91 | { |
92 | string param = GetParam(path); | 92 | string param = GetParam(path); |
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 3c9d650..628c471 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -119,7 +119,9 @@ namespace OpenSim.Grid.UserServer | |||
119 | RegionProfileData.RequestSimProfileData( | 119 | RegionProfileData.RequestSimProfileData( |
120 | theUser.HomeRegion, m_config.GridServerURL, | 120 | theUser.HomeRegion, m_config.GridServerURL, |
121 | m_config.GridSendKey, m_config.GridRecvKey); | 121 | m_config.GridSendKey, m_config.GridRecvKey); |
122 | } else { | 122 | } |
123 | else | ||
124 | { | ||
123 | start_x = Convert.ToInt32(startLocationRequestParsed[1]); | 125 | start_x = Convert.ToInt32(startLocationRequestParsed[1]); |
124 | start_y = Convert.ToInt32(startLocationRequestParsed[2]); | 126 | start_y = Convert.ToInt32(startLocationRequestParsed[2]); |
125 | start_z = Convert.ToInt32(startLocationRequestParsed[3]); | 127 | start_z = Convert.ToInt32(startLocationRequestParsed[3]); |
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 706f461..a82505d 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Grid.UserServer | |||
57 | /// <param name="httpRequest">HTTP request header object</param> | 57 | /// <param name="httpRequest">HTTP request header object</param> |
58 | /// <param name="httpResponse">HTTP response header object</param> | 58 | /// <param name="httpResponse">HTTP response header object</param> |
59 | /// <returns>Success "OK" else error</returns> | 59 | /// <returns>Success "OK" else error</returns> |
60 | public string RestDeleteUserSessionMethod(string request, string path, string param, | 60 | public string RestDeleteUserSessionMethod(string request, string path, string param, |
61 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 61 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
62 | { | 62 | { |
63 | // TODO! Important! | 63 | // TODO! Important! |
@@ -260,11 +260,14 @@ namespace OpenSim.Grid.UserServer | |||
260 | if (requestData.Contains("owner")) | 260 | if (requestData.Contains("owner")) |
261 | { | 261 | { |
262 | appearance = GetUserAppearance(new LLUUID((string)requestData["owner"])); | 262 | appearance = GetUserAppearance(new LLUUID((string)requestData["owner"])); |
263 | if (appearance == null) { | 263 | if (appearance == null) |
264 | { | ||
264 | responseData = new Hashtable(); | 265 | responseData = new Hashtable(); |
265 | responseData["error_type"] = "no appearance"; | 266 | responseData["error_type"] = "no appearance"; |
266 | responseData["error_desc"] = "There was no appearance found for this avatar"; | 267 | responseData["error_desc"] = "There was no appearance found for this avatar"; |
267 | } else { | 268 | } |
269 | else | ||
270 | { | ||
268 | responseData = appearance.ToHashTable(); | 271 | responseData = appearance.ToHashTable(); |
269 | } | 272 | } |
270 | } | 273 | } |