aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp
diff options
context:
space:
mode:
authorlbsa712007-07-03 14:37:29 +0000
committerlbsa712007-07-03 14:37:29 +0000
commit9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch)
tree8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region/Examples/SimpleApp
parent* Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff)
downloadopensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs9
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs16
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs25
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs2
4 files changed, 19 insertions, 33 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs b/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
index c3d3d33..f946482 100644
--- a/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
+++ b/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
@@ -1,10 +1,7 @@
1using System; 1using System.Collections;
2using System.Collections.Generic;
3using System.Text; 2using System.Text;
4using OpenSim.Framework.Servers;
5using OpenSim.Region.Capabilities;
6using libsecondlife; 3using libsecondlife;
7using System.Collections; 4using OpenSim.Region.Capabilities;
8 5
9namespace OpenSim.Framework.Servers 6namespace OpenSim.Framework.Servers
10{ 7{
@@ -28,7 +25,7 @@ namespace OpenSim.Framework.Servers
28 25
29 public string Handle(string body, string path) 26 public string Handle(string body, string path)
30 { 27 {
31 Encoding _enc = System.Text.Encoding.UTF8; 28 Encoding _enc = Encoding.UTF8;
32 Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes( body )); 29 Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes( body ));
33 TRequest request = new TRequest(); 30 TRequest request = new TRequest();
34 31
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 8e6fd8f..3245223 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -1,23 +1,19 @@
1using System;
2using System.Collections.Generic; 1using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Interfaces;
5using OpenSim.Framework.Types;
6using OpenSim.Framework.Console;
7using libsecondlife; 2using libsecondlife;
8using OpenSim.Region.Environment;
9using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
10using OpenSim.Region.Environment.Scenes;
11using OpenSim.Framework; 3using OpenSim.Framework;
12using OpenSim.Region.Caches;
13using OpenSim.Framework.Communications; 4using OpenSim.Framework.Communications;
5using OpenSim.Framework.Interfaces;
14using OpenSim.Framework.Servers; 6using OpenSim.Framework.Servers;
7using OpenSim.Framework.Types;
8using OpenSim.Region.Caches;
9using OpenSim.Region.Environment.Scenes;
10using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
15 11
16namespace SimpleApp 12namespace SimpleApp
17{ 13{
18 public class MyWorld : Scene 14 public class MyWorld : Scene
19 { 15 {
20 private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars; 16 private List<ScenePresence> m_avatars;
21 17
22 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) 18 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
23 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer) 19 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 6bf6657..bc84c35 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -1,23 +1,18 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Net;
3using System.Text;
4using OpenSim;
5using OpenSim.Region.GridInterfaces.Local;
6using OpenSim.Framework.Interfaces;
7using OpenSim.Framework.Types;
8using OpenSim.Framework.Console;
9using OpenSim.Framework.Servers;
10using OpenSim.Assets;
11using libsecondlife; 3using libsecondlife;
4using OpenSim.Assets;
12using OpenSim.Framework; 5using OpenSim.Framework;
13using OpenSim.Region.Caches; 6using OpenSim.Framework.Console;
14using OpenSim.Framework.Communications; 7using OpenSim.Framework.Interfaces;
15using OpenSim.Region.Communications.Local; 8using OpenSim.Framework.Servers;
16using OpenSim.Region.ClientStack; 9using OpenSim.Framework.Types;
17using System.Net;
18using libsecondlife.Packets;
19using OpenSim.Physics.Manager; 10using OpenSim.Physics.Manager;
11using OpenSim.Region.Caches;
20using OpenSim.Region.Capabilities; 12using OpenSim.Region.Capabilities;
13using OpenSim.Region.ClientStack;
14using OpenSim.Region.Communications.Local;
15using OpenSim.Region.GridInterfaces.Local;
21 16
22namespace SimpleApp 17namespace SimpleApp
23{ 18{
diff --git a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
index 0f9bf0f..3b0de8a 100644
--- a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// associated with an assembly.