From efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 27 Dec 2007 21:41:48 +0000 Subject: * Optimized usings * shortened references * Removed redundant 'this' * Normalized EOF --- .../Region/Examples/SimpleApp/FileSystemObject.cs | 1 - .../Region/Examples/SimpleApp/MyNpcCharacter.cs | 27 ++++++++++++---------- OpenSim/Region/Examples/SimpleApp/MyWorld.cs | 9 +++++--- OpenSim/Region/Examples/SimpleApp/Program.cs | 5 ++-- 4 files changed, 24 insertions(+), 18 deletions(-) (limited to 'OpenSim/Region/Examples') 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 @@ * */ -using System; using System.IO; using libsecondlife; 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 @@ using System; using System.Collections.Generic; using System.Net; -using System.Text; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework; @@ -62,7 +61,7 @@ namespace SimpleApp public event LinkObjects OnLinkObjects; public event DelinkObjects OnDelinkObjects; public event RequestMapBlocks OnRequestMapBlocks; - public event RequestMapName OnMapNameRequest; + public event RequestMapName OnMapNameRequest; public event TeleportLocationRequest OnTeleportLocationRequest; public event DisconnectUser OnDisconnectUser; public event RequestAvatarProperties OnRequestAvatarProperties; @@ -139,7 +138,7 @@ namespace SimpleApp public event EstateOwnerMessageRequest OnEstateOwnerMessage; public event RegionInfoRequest OnRegionInfoRequest; public event EstateCovenantRequest OnEstateCovenantRequest; - + #pragma warning restore 67 @@ -168,7 +167,7 @@ namespace SimpleApp { get { return LLUUID.Zero; } } - + public LLUUID SecureSessionId { get { return LLUUID.Zero; } @@ -185,7 +184,7 @@ namespace SimpleApp { get { return lastName; } } - + public virtual String Name { get { return FirstName + LastName; } @@ -314,7 +313,8 @@ namespace SimpleApp public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, - LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, + LLUUID objectID, LLUUID ownerID, string text, byte[] color, + uint parentID, byte[] particleSystem, LLQuaternion rotation, byte clickAction) { } @@ -323,14 +323,16 @@ namespace SimpleApp LLVector3 position, LLQuaternion rotation) { } + public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, - LLVector3 position, LLQuaternion rotation,LLVector3 velocity, LLVector3 rotationalvelocity) + LLVector3 position, LLQuaternion rotation, LLVector3 velocity, + LLVector3 rotationalvelocity) { } - public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, - List items, - List folders, + public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, + List items, + List folders, bool fetchFolders, bool fetchItems) { @@ -376,9 +378,11 @@ namespace SimpleApp public void SendAgentAlertMessage(string message, bool modal) { } + public void SendSystemAlertMessage(string message) { } + public void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url) { @@ -477,7 +481,6 @@ namespace SimpleApp public void Stop() { - } private uint m_circuitCode; @@ -492,4 +495,4 @@ namespace SimpleApp { } } -} +} \ 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 { private List m_avatars; - public MyWorld(RegionInfo regionInfo, AgentCircuitManager authen, PermissionManager permissionManager, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, + public MyWorld(RegionInfo regionInfo, AgentCircuitManager authen, PermissionManager permissionManager, + CommunicationsManager commsMan, SceneCommunicationService sceneGridService, AssetCache assetCach, StorageManager storeMan, BaseHttpServer httpServer, ModuleLoader moduleLoader, bool physicalPrim, bool ChildGetTasks) - : base(regionInfo, authen, permissionManager, commsMan, sceneGridService, assetCach, storeMan, httpServer, moduleLoader, false, true, false) + : base( + regionInfo, authen, permissionManager, commsMan, sceneGridService, assetCach, storeMan, httpServer, + moduleLoader, false, true, false) { m_avatars = new List(); } @@ -73,7 +76,7 @@ namespace SimpleApp client.OnCompleteMovementToRegion += delegate() { client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero); }; - + client.SendRegionHandshake(m_regInfo); } } 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 PermissionManager permissionManager = new PermissionManager(); SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); return - new MyWorld(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer, + new MyWorld(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, + m_assetCache, storageManager, m_httpServer, new ModuleLoader(m_log, m_config), true, false); } @@ -214,4 +215,4 @@ namespace SimpleApp app.Run(); } } -} +} \ No newline at end of file -- cgit v1.1