diff options
author | lbsa71 | 2007-07-03 14:37:29 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-03 14:37:29 +0000 |
commit | 9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch) | |
tree | 8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Region/Examples/SimpleApp | |
parent | * Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff) | |
download | opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2 opensim-SC-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz |
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp')
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 @@ | |||
1 | using System; | 1 | using System.Collections; |
2 | using System.Collections.Generic; | ||
3 | using System.Text; | 2 | using System.Text; |
4 | using OpenSim.Framework.Servers; | ||
5 | using OpenSim.Region.Capabilities; | ||
6 | using libsecondlife; | 3 | using libsecondlife; |
7 | using System.Collections; | 4 | using OpenSim.Region.Capabilities; |
8 | 5 | ||
9 | namespace OpenSim.Framework.Servers | 6 | namespace 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 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | 1 | using System.Collections.Generic; |
3 | using System.Text; | ||
4 | using OpenSim.Framework.Interfaces; | ||
5 | using OpenSim.Framework.Types; | ||
6 | using OpenSim.Framework.Console; | ||
7 | using libsecondlife; | 2 | using libsecondlife; |
8 | using OpenSim.Region.Environment; | ||
9 | using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence; | ||
10 | using OpenSim.Region.Environment.Scenes; | ||
11 | using OpenSim.Framework; | 3 | using OpenSim.Framework; |
12 | using OpenSim.Region.Caches; | ||
13 | using OpenSim.Framework.Communications; | 4 | using OpenSim.Framework.Communications; |
5 | using OpenSim.Framework.Interfaces; | ||
14 | using OpenSim.Framework.Servers; | 6 | using OpenSim.Framework.Servers; |
7 | using OpenSim.Framework.Types; | ||
8 | using OpenSim.Region.Caches; | ||
9 | using OpenSim.Region.Environment.Scenes; | ||
10 | using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence; | ||
15 | 11 | ||
16 | namespace SimpleApp | 12 | namespace 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 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Net; |
3 | using System.Text; | ||
4 | using OpenSim; | ||
5 | using OpenSim.Region.GridInterfaces.Local; | ||
6 | using OpenSim.Framework.Interfaces; | ||
7 | using OpenSim.Framework.Types; | ||
8 | using OpenSim.Framework.Console; | ||
9 | using OpenSim.Framework.Servers; | ||
10 | using OpenSim.Assets; | ||
11 | using libsecondlife; | 3 | using libsecondlife; |
4 | using OpenSim.Assets; | ||
12 | using OpenSim.Framework; | 5 | using OpenSim.Framework; |
13 | using OpenSim.Region.Caches; | 6 | using OpenSim.Framework.Console; |
14 | using OpenSim.Framework.Communications; | 7 | using OpenSim.Framework.Interfaces; |
15 | using OpenSim.Region.Communications.Local; | 8 | using OpenSim.Framework.Servers; |
16 | using OpenSim.Region.ClientStack; | 9 | using OpenSim.Framework.Types; |
17 | using System.Net; | ||
18 | using libsecondlife.Packets; | ||
19 | using OpenSim.Physics.Manager; | 10 | using OpenSim.Physics.Manager; |
11 | using OpenSim.Region.Caches; | ||
20 | using OpenSim.Region.Capabilities; | 12 | using OpenSim.Region.Capabilities; |
13 | using OpenSim.Region.ClientStack; | ||
14 | using OpenSim.Region.Communications.Local; | ||
15 | using OpenSim.Region.GridInterfaces.Local; | ||
21 | 16 | ||
22 | namespace SimpleApp | 17 | namespace 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 @@ | |||
1 | using System.Reflection; | 1 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 2 | using 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. |