aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Communications
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Region/CoreModules/Communications
parentThanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff)
downloadopensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.zip
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz
* optimized usings.
Diffstat (limited to 'OpenSim/Region/CoreModules/Communications')
-rw-r--r--OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs10
-rw-r--r--OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs46
2 files changed, 21 insertions, 35 deletions
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index 98536ed..ac40a17 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -24,20 +24,12 @@
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;
28using System.Collections;
29using System.Collections.Generic; 27using System.Collections.Generic;
30using System.Net;
31using System.Net.Sockets;
32using System.Reflection; 28using System.Reflection;
33using System.Threading;
34using System.Xml;
35using OpenMetaverse;
36using log4net; 29using log4net;
37using Nini.Config; 30using Nini.Config;
38using Nwc.XmlRpc; 31using OpenMetaverse;
39using OpenSim.Framework; 32using OpenSim.Framework;
40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
43 35
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 }