aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs')
-rw-r--r--OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs46
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 */
27using System; 27using System;
28using System.Collections; 28using System.Collections;
29using System.Collections.Generic; 29using System.IO;
30using System.IO; 30using System.Net;
31using System.Net; 31using System.Reflection;
32using System.Net.Sockets; 32using System.Text;
33using System.Reflection; 33using log4net;
34using System.Threading; 34using Nini.Config;
35using System.Xml; 35using OpenMetaverse;
36using OpenMetaverse; 36using OpenMetaverse.StructuredData;
37using OpenMetaverse.StructuredData; 37using OpenSim.Framework;
38using log4net; 38using OpenSim.Framework.Communications;
39using Nini.Config; 39using OpenSim.Region.CoreModules.Communications.Local;
40using Nwc.XmlRpc; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Framework; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Framework.Communications; 42using OpenSim.Region.Framework.Scenes.Hypergrid;
43using OpenSim.Framework.Communications.Cache; 43
44using OpenSim.Framework.Servers;
45using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Framework.Scenes.Hypergrid;
48using OpenSim.Region.CoreModules.Communications.Local;
49
50namespace OpenSim.Region.CoreModules.Communications.REST 44namespace 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 }