diff options
author | lbsa71 | 2007-12-27 21:41:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 21:41:48 +0000 |
commit | efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch) | |
tree | bf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Region/Examples | |
parent | * removed always true if (diff) | |
download | opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2 opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz |
* Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | 27 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/MyWorld.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 5 |
4 files changed, 24 insertions, 18 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs index b3084a2..2d8441e 100644 --- a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs | |||
@@ -26,7 +26,6 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | ||
30 | using System.IO; | 29 | using System.IO; |
31 | using libsecondlife; | 30 | using libsecondlife; |
32 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index ec93362..3e191b4 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | |||
@@ -29,7 +29,6 @@ | |||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Text; | ||
33 | using libsecondlife; | 32 | using libsecondlife; |
34 | using libsecondlife.Packets; | 33 | using libsecondlife.Packets; |
35 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
@@ -62,7 +61,7 @@ namespace SimpleApp | |||
62 | public event LinkObjects OnLinkObjects; | 61 | public event LinkObjects OnLinkObjects; |
63 | public event DelinkObjects OnDelinkObjects; | 62 | public event DelinkObjects OnDelinkObjects; |
64 | public event RequestMapBlocks OnRequestMapBlocks; | 63 | public event RequestMapBlocks OnRequestMapBlocks; |
65 | public event RequestMapName OnMapNameRequest; | 64 | public event RequestMapName OnMapNameRequest; |
66 | public event TeleportLocationRequest OnTeleportLocationRequest; | 65 | public event TeleportLocationRequest OnTeleportLocationRequest; |
67 | public event DisconnectUser OnDisconnectUser; | 66 | public event DisconnectUser OnDisconnectUser; |
68 | public event RequestAvatarProperties OnRequestAvatarProperties; | 67 | public event RequestAvatarProperties OnRequestAvatarProperties; |
@@ -139,7 +138,7 @@ namespace SimpleApp | |||
139 | public event EstateOwnerMessageRequest OnEstateOwnerMessage; | 138 | public event EstateOwnerMessageRequest OnEstateOwnerMessage; |
140 | public event RegionInfoRequest OnRegionInfoRequest; | 139 | public event RegionInfoRequest OnRegionInfoRequest; |
141 | public event EstateCovenantRequest OnEstateCovenantRequest; | 140 | public event EstateCovenantRequest OnEstateCovenantRequest; |
142 | 141 | ||
143 | 142 | ||
144 | #pragma warning restore 67 | 143 | #pragma warning restore 67 |
145 | 144 | ||
@@ -168,7 +167,7 @@ namespace SimpleApp | |||
168 | { | 167 | { |
169 | get { return LLUUID.Zero; } | 168 | get { return LLUUID.Zero; } |
170 | } | 169 | } |
171 | 170 | ||
172 | public LLUUID SecureSessionId | 171 | public LLUUID SecureSessionId |
173 | { | 172 | { |
174 | get { return LLUUID.Zero; } | 173 | get { return LLUUID.Zero; } |
@@ -185,7 +184,7 @@ namespace SimpleApp | |||
185 | { | 184 | { |
186 | get { return lastName; } | 185 | get { return lastName; } |
187 | } | 186 | } |
188 | 187 | ||
189 | public virtual String Name | 188 | public virtual String Name |
190 | { | 189 | { |
191 | get { return FirstName + LastName; } | 190 | get { return FirstName + LastName; } |
@@ -314,7 +313,8 @@ namespace SimpleApp | |||
314 | 313 | ||
315 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 314 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, |
316 | PrimitiveBaseShape primShape, LLVector3 pos, uint flags, | 315 | PrimitiveBaseShape primShape, LLVector3 pos, uint flags, |
317 | LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, | 316 | LLUUID objectID, LLUUID ownerID, string text, byte[] color, |
317 | uint parentID, | ||
318 | byte[] particleSystem, LLQuaternion rotation, byte clickAction) | 318 | byte[] particleSystem, LLQuaternion rotation, byte clickAction) |
319 | { | 319 | { |
320 | } | 320 | } |
@@ -323,14 +323,16 @@ namespace SimpleApp | |||
323 | LLVector3 position, LLQuaternion rotation) | 323 | LLVector3 position, LLQuaternion rotation) |
324 | { | 324 | { |
325 | } | 325 | } |
326 | |||
326 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | 327 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, |
327 | LLVector3 position, LLQuaternion rotation,LLVector3 velocity, LLVector3 rotationalvelocity) | 328 | LLVector3 position, LLQuaternion rotation, LLVector3 velocity, |
329 | LLVector3 rotationalvelocity) | ||
328 | { | 330 | { |
329 | } | 331 | } |
330 | 332 | ||
331 | public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, | 333 | public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, |
332 | List<InventoryItemBase> items, | 334 | List<InventoryItemBase> items, |
333 | List<InventoryFolderBase> folders, | 335 | List<InventoryFolderBase> folders, |
334 | bool fetchFolders, | 336 | bool fetchFolders, |
335 | bool fetchItems) | 337 | bool fetchItems) |
336 | { | 338 | { |
@@ -376,9 +378,11 @@ namespace SimpleApp | |||
376 | public void SendAgentAlertMessage(string message, bool modal) | 378 | public void SendAgentAlertMessage(string message, bool modal) |
377 | { | 379 | { |
378 | } | 380 | } |
381 | |||
379 | public void SendSystemAlertMessage(string message) | 382 | public void SendSystemAlertMessage(string message) |
380 | { | 383 | { |
381 | } | 384 | } |
385 | |||
382 | public void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, | 386 | public void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, |
383 | string url) | 387 | string url) |
384 | { | 388 | { |
@@ -477,7 +481,6 @@ namespace SimpleApp | |||
477 | 481 | ||
478 | public void Stop() | 482 | public void Stop() |
479 | { | 483 | { |
480 | |||
481 | } | 484 | } |
482 | 485 | ||
483 | private uint m_circuitCode; | 486 | private uint m_circuitCode; |
@@ -492,4 +495,4 @@ namespace SimpleApp | |||
492 | { | 495 | { |
493 | } | 496 | } |
494 | } | 497 | } |
495 | } | 498 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs index d5f702d..4c12b3f 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs | |||
@@ -41,10 +41,13 @@ namespace SimpleApp | |||
41 | { | 41 | { |
42 | private List<ScenePresence> m_avatars; | 42 | private List<ScenePresence> m_avatars; |
43 | 43 | ||
44 | public MyWorld(RegionInfo regionInfo, AgentCircuitManager authen, PermissionManager permissionManager, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 44 | public MyWorld(RegionInfo regionInfo, AgentCircuitManager authen, PermissionManager permissionManager, |
45 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | ||
45 | AssetCache assetCach, StorageManager storeMan, BaseHttpServer httpServer, | 46 | AssetCache assetCach, StorageManager storeMan, BaseHttpServer httpServer, |
46 | ModuleLoader moduleLoader, bool physicalPrim, bool ChildGetTasks) | 47 | ModuleLoader moduleLoader, bool physicalPrim, bool ChildGetTasks) |
47 | : base(regionInfo, authen, permissionManager, commsMan, sceneGridService, assetCach, storeMan, httpServer, moduleLoader, false, true, false) | 48 | : base( |
49 | regionInfo, authen, permissionManager, commsMan, sceneGridService, assetCach, storeMan, httpServer, | ||
50 | moduleLoader, false, true, false) | ||
48 | { | 51 | { |
49 | m_avatars = new List<ScenePresence>(); | 52 | m_avatars = new List<ScenePresence>(); |
50 | } | 53 | } |
@@ -73,7 +76,7 @@ namespace SimpleApp | |||
73 | 76 | ||
74 | client.OnCompleteMovementToRegion += | 77 | client.OnCompleteMovementToRegion += |
75 | delegate() { client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero); }; | 78 | delegate() { client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero); }; |
76 | 79 | ||
77 | client.SendRegionHandshake(m_regInfo); | 80 | client.SendRegionHandshake(m_regInfo); |
78 | } | 81 | } |
79 | } | 82 | } |
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 02108d0..d872bf6 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -179,7 +179,8 @@ namespace SimpleApp | |||
179 | PermissionManager permissionManager = new PermissionManager(); | 179 | PermissionManager permissionManager = new PermissionManager(); |
180 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); | 180 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); |
181 | return | 181 | return |
182 | new MyWorld(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer, | 182 | new MyWorld(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, |
183 | m_assetCache, storageManager, m_httpServer, | ||
183 | new ModuleLoader(m_log, m_config), true, false); | 184 | new ModuleLoader(m_log, m_config), true, false); |
184 | } | 185 | } |
185 | 186 | ||
@@ -214,4 +215,4 @@ namespace SimpleApp | |||
214 | app.Run(); | 215 | app.Run(); |
215 | } | 216 | } |
216 | } | 217 | } |
217 | } | 218 | } \ No newline at end of file |