diff options
| author | Justin Clark-Casey (justincc) | 2013-09-03 00:06:50 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-09-03 00:06:50 +0100 |
| commit | fc9f50d9408f86fbe61244ff11f70fde64295e32 (patch) | |
| tree | 4f5443998e0a728a9961ddc93a6e878438df9efc | |
| parent | Add experimental "show grid users online" console command to show grid users ... (diff) | |
| parent | Remove test that gives issue on Windows, just let the try/catch do the work. (diff) | |
| download | opensim-SC_OLD-fc9f50d9408f86fbe61244ff11f70fde64295e32.zip opensim-SC_OLD-fc9f50d9408f86fbe61244ff11f70fde64295e32.tar.gz opensim-SC_OLD-fc9f50d9408f86fbe61244ff11f70fde64295e32.tar.bz2 opensim-SC_OLD-fc9f50d9408f86fbe61244ff11f70fde64295e32.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index bf1cffb..56ff2bd 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
| @@ -1212,7 +1212,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
| 1212 | json.Add("jsonrpc", OSD.FromString("2.0")); | 1212 | json.Add("jsonrpc", OSD.FromString("2.0")); |
| 1213 | json.Add("id", OSD.FromString(jsonId)); | 1213 | json.Add("id", OSD.FromString(jsonId)); |
| 1214 | json.Add("method", OSD.FromString(method)); | 1214 | json.Add("method", OSD.FromString(method)); |
| 1215 | // Experiment | 1215 | |
| 1216 | json.Add("params", OSD.SerializeMembers(parameters)); | 1216 | json.Add("params", OSD.SerializeMembers(parameters)); |
| 1217 | 1217 | ||
| 1218 | string jsonRequestData = OSDParser.SerializeJsonString(json); | 1218 | string jsonRequestData = OSDParser.SerializeJsonString(json); |
| @@ -1240,8 +1240,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
| 1240 | } | 1240 | } |
| 1241 | 1241 | ||
| 1242 | Stream rstream = webResponse.GetResponseStream(); | 1242 | Stream rstream = webResponse.GetResponseStream(); |
| 1243 | if (rstream.Length < 1) | ||
| 1244 | return false; | ||
| 1245 | 1243 | ||
| 1246 | OSDMap mret = new OSDMap(); | 1244 | OSDMap mret = new OSDMap(); |
| 1247 | try | 1245 | try |
| @@ -1318,8 +1316,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
| 1318 | } | 1316 | } |
| 1319 | 1317 | ||
| 1320 | Stream rstream = webResponse.GetResponseStream(); | 1318 | Stream rstream = webResponse.GetResponseStream(); |
| 1321 | if (rstream.Length < 1) | ||
| 1322 | return false; | ||
| 1323 | 1319 | ||
| 1324 | OSDMap response = new OSDMap(); | 1320 | OSDMap response = new OSDMap(); |
| 1325 | try | 1321 | try |