diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs index 8a4bb09..3574b39 100644 --- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs | |||
@@ -24,29 +24,23 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections; | 28 | using System.Collections; |
29 | using System.Collections.Generic; | 29 | using System.IO; |
30 | using System.IO; | 30 | using System.Net; |
31 | using System.Net; | 31 | using System.Reflection; |
32 | using System.Net.Sockets; | 32 | using System.Text; |
33 | using System.Reflection; | 33 | using log4net; |
34 | using System.Threading; | 34 | using Nini.Config; |
35 | using System.Xml; | 35 | using OpenMetaverse; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse.StructuredData; |
37 | using OpenMetaverse.StructuredData; | 37 | using OpenSim.Framework; |
38 | using log4net; | 38 | using OpenSim.Framework.Communications; |
39 | using Nini.Config; | 39 | using OpenSim.Region.CoreModules.Communications.Local; |
40 | using Nwc.XmlRpc; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Framework.Communications; | 42 | using OpenSim.Region.Framework.Scenes.Hypergrid; |
43 | using OpenSim.Framework.Communications.Cache; | 43 | |
44 | using OpenSim.Framework.Servers; | ||
45 | using OpenSim.Region.Framework.Interfaces; | ||
46 | using OpenSim.Region.Framework.Scenes; | ||
47 | using OpenSim.Region.Framework.Scenes.Hypergrid; | ||
48 | using OpenSim.Region.CoreModules.Communications.Local; | ||
49 | |||
50 | namespace OpenSim.Region.CoreModules.Communications.REST | 44 | namespace OpenSim.Region.CoreModules.Communications.REST |
51 | { | 45 | { |
52 | public class RESTInterregionComms : IRegionModule, IInterregionCommsOut | 46 | public class RESTInterregionComms : IRegionModule, IInterregionCommsOut |
@@ -278,7 +272,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
278 | try | 272 | try |
279 | { | 273 | { |
280 | strBuffer = OSDParser.SerializeJsonString(args); | 274 | strBuffer = OSDParser.SerializeJsonString(args); |
281 | System.Text.UTF8Encoding str = new System.Text.UTF8Encoding(); | 275 | UTF8Encoding str = new UTF8Encoding(); |
282 | buffer = str.GetBytes(strBuffer); | 276 | buffer = str.GetBytes(strBuffer); |
283 | 277 | ||
284 | } | 278 | } |
@@ -363,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
363 | try | 357 | try |
364 | { | 358 | { |
365 | strBuffer = OSDParser.SerializeJsonString(args); | 359 | strBuffer = OSDParser.SerializeJsonString(args); |
366 | System.Text.UTF8Encoding str = new System.Text.UTF8Encoding(); | 360 | UTF8Encoding str = new UTF8Encoding(); |
367 | buffer = str.GetBytes(strBuffer); | 361 | buffer = str.GetBytes(strBuffer); |
368 | 362 | ||
369 | } | 363 | } |
@@ -509,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
509 | try | 503 | try |
510 | { | 504 | { |
511 | strBuffer = OSDParser.SerializeJsonString(args); | 505 | strBuffer = OSDParser.SerializeJsonString(args); |
512 | System.Text.UTF8Encoding str = new System.Text.UTF8Encoding(); | 506 | UTF8Encoding str = new UTF8Encoding(); |
513 | buffer = str.GetBytes(strBuffer); | 507 | buffer = str.GetBytes(strBuffer); |
514 | 508 | ||
515 | } | 509 | } |