From 65c5efe43b68700bad94076d4cd421160203c5de Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 16 May 2008 01:22:11 +0000 Subject: Formatting cleanup. --- OpenSim/Region/Application/Application.cs | 8 +- OpenSim/Region/Application/OpenSimMain.cs | 82 ++-- OpenSim/Region/Application/OpenSimMainConsole.cs | 24 +- .../Region/ClientStack/LindenUDP/LLClientView.cs | 232 +++++------ .../Region/ClientStack/LindenUDP/LLPacketQueue.cs | 30 +- .../Region/ClientStack/LindenUDP/LLPacketServer.cs | 12 +- .../Region/ClientStack/LindenUDP/LLUDPServer.cs | 32 +- .../Region/ClientStack/RegionApplicationBase.cs | 8 +- .../Communications/Local/LocalBackEndServices.cs | 8 +- .../Communications/Local/LocalInventoryService.cs | 18 +- .../Communications/Local/LocalLoginService.cs | 46 +-- .../Communications/Local/LocalUserServices.cs | 2 +- .../Local/Properties/AssemblyInfo.cs | 10 +- .../Region/Communications/OGS1/OGS1GridServices.cs | 132 +++--- .../Communications/OGS1/OGS1InventoryService.cs | 84 ++-- .../Region/Communications/OGS1/OGS1UserServices.cs | 42 +- .../Communications/OGS1/Properties/AssemblyInfo.cs | 10 +- OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 4 +- OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 12 +- .../Interfaces/IDataSnapshotProvider.cs | 2 +- OpenSim/Region/DataSnapshot/LandSnapshot.cs | 8 +- OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 2 +- .../Region/Environment/InstantMessageReceiver.cs | 4 +- .../Environment/Interfaces/IAvatarFactory.cs | 2 +- .../Environment/Interfaces/IScenePermissions.cs | 2 +- .../Environment/Interfaces/ITextureSender.cs | 8 +- .../Agent/AssetDownload/AssetDownloadModule.cs | 2 +- .../AssetTransaction/AgentAssetsTransactions.cs | 8 +- .../AssetTransaction/AssetTransactionModule.cs | 6 +- .../Agent/TextureDownload/TextureDownloadModule.cs | 4 +- .../Agent/TextureDownload/TextureNotFoundSender.cs | 4 +- .../TextureDownload/UserTextureDownloadService.cs | 18 +- .../Modules/Agent/TextureSender/TextureSender.cs | 10 +- .../Environment/Modules/Agent/Xfer/XferModule.cs | 2 +- .../Environment/Modules/Avatar/Chat/ChatModule.cs | 6 +- .../Currency/SampleMoney/SampleMoneyModule.cs | 12 +- .../Modules/Avatar/Friends/FriendsModule.cs | 20 +- .../Modules/Avatar/Inventory/InventoryModule.cs | 2 +- .../Avatar/Profiles/AvatarProfilesModule.cs | 2 +- .../Voice/AsterixVoice/AsteriskVoiceModule.cs | 2 +- .../Scripting/HttpRequest/ScriptsHttpRequests.cs | 22 +- .../Scripting/VectorRender/VectorRenderModule.cs | 2 +- .../Modules/Scripting/WorldComm/WorldCommModule.cs | 34 +- .../Modules/Scripting/XMLRPC/XMLRPCModule.cs | 26 +- .../Environment/Modules/World/Land/LandChannel.cs | 8 +- .../Environment/Modules/World/Land/LandObject.cs | 2 +- .../Modules/World/Permissions/PermissionsModule.cs | 136 +++---- .../Environment/Modules/World/Sun/SunModule.cs | 8 +- .../Modules/World/Terrain/FileLoaders/BMP.cs | 4 +- .../Terrain/FileLoaders/GenericSystemDrawing.cs | 6 +- .../World/Terrain/PaintBrushes/FlattenSphere.cs | 8 +- .../World/Terrain/PaintBrushes/OlsenSphere.cs | 6 +- .../World/Terrain/PaintBrushes/SmoothSphere.cs | 8 +- .../World/Terrain/PaintBrushes/WeatherSphere.cs | 2 +- OpenSim/Region/Environment/Scenes/EntityBase.cs | 10 +- OpenSim/Region/Environment/Scenes/InnerScene.cs | 82 ++-- .../Region/Environment/Scenes/Scene.Inventory.cs | 444 ++++++++++----------- .../Environment/Scenes/Scene.PacketHandlers.cs | 10 +- OpenSim/Region/Environment/Scenes/Scene.cs | 262 ++++++------ OpenSim/Region/Environment/Scenes/SceneBase.cs | 18 +- .../Scenes/SceneCommunicationService.cs | 60 +-- OpenSim/Region/Environment/Scenes/SceneEvents.cs | 16 +- .../Environment/Scenes/SceneExternalChecks.cs | 18 +- OpenSim/Region/Environment/Scenes/SceneManager.cs | 6 +- .../Scenes/SceneObjectGroup.Inventory.cs | 118 +++--- .../Region/Environment/Scenes/SceneObjectGroup.cs | 132 +++--- .../Scenes/SceneObjectPart.Inventory.cs | 184 ++++----- .../Region/Environment/Scenes/SceneObjectPart.cs | 202 +++++----- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 184 ++++----- .../Region/Environment/Scenes/SceneXmlLoader.cs | 8 +- .../Region/Environment/Scenes/SimStatsReporter.cs | 88 ++-- OpenSim/Region/Environment/Types/UpdateQueue.cs | 4 +- .../Region/Examples/SimpleModule/MyNpcCharacter.cs | 18 +- .../SimpleModule/Properties/AssemblyInfo.cs | 10 +- .../Modules/AvatarFactory/AvatarFactoryModule.cs | 8 +- .../AvatarFactory/Properties/AssemblyInfo.cs | 10 +- .../Modules/Python/Properties/AssemblyInfo.cs | 10 +- .../SvnSerialiser/Properties/AssemblyInfo.cs | 10 +- .../Region/Physics/BulletXPlugin/BulletXPlugin.cs | 20 +- .../BulletXPlugin/TriangleIndexVertexArray.cs | 4 +- OpenSim/Region/Physics/Manager/PhysicsActor.cs | 22 +- .../Region/Physics/Manager/PhysicsPluginManager.cs | 8 +- OpenSim/Region/Physics/Manager/PhysicsSensor.cs | 2 +- OpenSim/Region/Physics/Manager/ZeroMesher.cs | 4 +- OpenSim/Region/Physics/Meshing/HelperTypes.cs | 14 +- OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 64 +-- OpenSim/Region/Physics/Meshing/SimpleHull.cs | 2 +- OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 62 +-- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 226 +++++------ OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 208 ++++------ OpenSim/Region/Physics/POSPlugin/POSPlugin.cs | 6 +- .../Common/BuiltIn_Commands_BaseClass.cs | 6 +- OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs | 2 +- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 290 +++++++------- OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 22 +- .../ScriptEngine/Common/OSSL_BuilIn_Commands.cs | 4 +- .../Common/OSSL_BuilIn_Commands_Interface.cs | 2 +- .../ScriptEngine/Common/Properties/AssemblyInfo.cs | 8 +- .../Common/ScriptEngineBase/AsyncCommandManager.cs | 4 +- .../AsyncCommandPlugins/SensorRepeat.cs | 2 +- .../ScriptEngineBase/AsyncCommandPlugins/Timer.cs | 2 +- .../Common/ScriptEngineBase/MaintenanceThread.cs | 4 +- .../Common/ScriptEngineBase/ScriptEngine.cs | 4 +- .../Common/ScriptEngineBase/ScriptManager.cs | 6 +- .../Region/ScriptEngine/Common/TRPC/TCPServer.cs | 2 +- OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs | 2 +- .../DotNetEngine/Compiler/LSL/Compiler.cs | 12 +- .../DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 27 +- .../DotNetEngine/Properties/AssemblyInfo.cs | 10 +- .../ScriptEngine/DotNetEngine/ScriptManager.cs | 2 +- .../Region/ScriptEngine/LSOEngine/LSO/Engine.cs | 10 +- .../LSOEngine/LSO/LSL_BaseClass_OPCODES.cs | 4 +- .../ScriptEngine/LSOEngine/LSO/LSO_Parser.cs | 28 +- .../LSOEngine/Properties/AssemblyInfo.cs | 10 +- .../Region/ScriptEngine/LSOEngine/ScriptManager.cs | 2 +- .../RemoteServer/Properties/AssemblyInfo.cs | 10 +- .../ScriptEngine/RemoteServer/ScriptEngine.cs | 2 +- .../Properties/AssemblyInfo.cs | 10 +- .../OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | 14 +- 119 files changed, 2068 insertions(+), 2181 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index d349d37..b2c710a 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -59,7 +59,7 @@ namespace OpenSim } Console.WriteLine("Starting...\n"); - + Culture.SetCurrentCulture(); ArgvConfigSource configSource = new ArgvConfigSource(args); @@ -110,7 +110,7 @@ namespace OpenSim _IsHandlingException = true; // TODO: Add config option to allow users to turn off error reporting // TODO: Post error report (disabled for now) - + string msg = String.Empty; msg += "\r\n"; msg += "APPLICATION EXCEPTION DETECTED: " + e.ToString() + "\r\n"; @@ -122,7 +122,7 @@ namespace OpenSim msg += "InnerException: " + ex.InnerException.ToString() + "\r\n"; msg += "\r\n"; - msg += "Application is terminating: " + e.IsTerminating.ToString() + "\r\n"; + msg += "Application is terminating: " + e.IsTerminating.ToString() + "\r\n"; // Do we not always want to see exception messages? // if (e.IsTerminating) @@ -132,7 +132,7 @@ namespace OpenSim try { // DISABLED UNTIL WE CAN DISCUSS IF THIS IS MORALLY RIGHT OR NOT - // Note! Needs reference to System.Web + // Note! Needs reference to System.Web //System.Net.WebClient wc = new WebClient(); //wc.DownloadData("http://www.opensimulator.org/ErrorReport.php?Msg=" + // System.Web.HttpUtility.UrlEncode(msg)); diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index a8f4bd4..7f13281 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -50,14 +50,14 @@ using OpenSim.Region.Physics.Manager; namespace OpenSim { public class OpenSimMain : RegionApplicationBase - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// Holds a human readable build version for this server. /// protected string buildVersion; - + protected string proxyUrl; protected int proxyOffset = 0; @@ -90,42 +90,42 @@ namespace OpenSim private string m_standaloneUserSource; protected string m_assetStorage = "local"; - + public ConsoleCommand CreateAccount = null; protected bool m_dumpAssetsToFile; - + protected List m_plugins = new List(); protected IConfigSource m_finalConfig = null; protected IniConfigSource m_config; - + public IniConfigSource ConfigSource { get { return m_config; } set { m_config = value; } } - + public List ClientServers { get { return m_clientServers; } } - + public List RegionData { get { return m_regionData; } } - + public new BaseHttpServer HttpServer { get { return m_httpServer; } } - + public new uint HttpServerPort { get { return m_httpServerPort; } } - + protected ModuleLoader m_moduleLoader; public ModuleLoader ModuleLoader @@ -146,10 +146,10 @@ namespace OpenSim if (Directory.Exists("addin-db-001")) Directory.Delete("addin-db-001", true); - - + + m_log.Info("[OPENSIM MAIN]: PLEASE IGNORE THE SCANNING ERRORS BELOW. These are the result of a temporary problem with our plugins manager."); - + AddinManager.Initialize("."); AddinManager.Registry.Update(null); @@ -270,13 +270,13 @@ namespace OpenSim m_sandbox = !startupConfig.GetBoolean("gridmode", false); m_physicsEngine = startupConfig.GetString("physics", "basicphysics"); m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher"); - + m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); - + m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Data.SQLite.dll"); - if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") + if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") { m_storageDll = "OpenSim.Data.SQLite.dll"; Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll."); @@ -311,10 +311,10 @@ namespace OpenSim m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); } - + m_networkServersInfo.loadFromConfiguration(m_config); - + } private ManualResetEvent WorldHasComeToAnEnd = new ManualResetEvent(false); @@ -331,19 +331,19 @@ namespace OpenSim m_log.Info("========================= STARTING OPENSIM ========================="); m_log.Info("===================================================================="); m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid"); - + InternalStartUp(); // We are done with startup m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}", m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : ""); - + WorldHasComeToAnEnd.WaitOne(); m_log.Info("[OPENSIM MAIN]: Shutdown complete, goodbye."); - + Environment.Exit(0); } - + /// /// Print the version information available to the library. This include a subversion number if the root /// .svn/entries file is present. @@ -392,9 +392,9 @@ namespace OpenSim protected void InternalStartUp() { printAvailableVersionInformation(); - + m_stats = StatsManager.StartCollectingSimExtraStats(); - + // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp // TerrainManager, StorageManager, HTTP Server // This base will call abstract Initialize @@ -425,7 +425,7 @@ namespace OpenSim // set up XMLRPC handler for client's initial login request message m_httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); - + // provides the web form login m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin); @@ -524,12 +524,12 @@ namespace OpenSim regionInfo.originRegionID = regionInfo.RegionID; // set initial ServerURI - regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port.ToString(); - - regionInfo.HttpPort = m_httpServerPort; - if ((proxyUrl.Length > 0) && (portadd_flag)) + regionInfo.HttpPort = m_httpServerPort; + + if ((proxyUrl.Length > 0) && (portadd_flag)) { // set proxy url to RegionInfo regionInfo.proxyUrl = proxyUrl; @@ -574,9 +574,9 @@ namespace OpenSim scene.SetModuleInterfaces(); //moved these here as the terrain texture has to be created after the modules are initialized - // and has to happen before the region is registered with the grid. + // and has to happen before the region is registered with the grid. scene.CreateTerrainTexture(true); - + try { scene.RegisterRegionWithGrid(); @@ -584,18 +584,18 @@ namespace OpenSim catch (Exception e) { m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e); - + // Carrying on now causes a lot of confusion down the line - we need to get the user's attention System.Environment.Exit(1); } - + // We need to do this after we've initialized the scripting engines. scene.StartScripts(); scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); scene.LandChannel.PerformParcelPrimCountUpdate(); - m_sceneManager.Add(scene); + m_sceneManager.Add(scene); m_clientServers.Add(clientServer); m_regionData.Add(regionInfo); @@ -625,7 +625,7 @@ namespace OpenSim new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager, m_httpServer, m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor, m_config); - + } public void handleRestartRegion(RegionInfo whichRegion) @@ -650,7 +650,7 @@ namespace OpenSim m_clientServers.RemoveAt(clientServerElement); } - //Removing the region from the sim's database of regions.. + //Removing the region from the sim's database of regions.. int RegionHandleElement = -1; for (int i = 0; i < m_regionData.Count; i++) { @@ -676,7 +676,7 @@ namespace OpenSim /// /// Handler to supply the current status of this sim - /// + /// /// Currently this is always OK if the simulator is still listening for connections on its HTTP service /// protected class SimStatusHandler : IStreamedRequestHandler @@ -709,9 +709,9 @@ namespace OpenSim /// public override void Shutdown() { - if (proxyUrl.Length > 0) + if (proxyUrl.Length > 0) { - Util.XmlRpcCommand(proxyUrl, "Stop"); + Util.XmlRpcCommand(proxyUrl, "Stop"); } m_log.Info("[SHUTDOWN]: Closing all threads"); @@ -721,9 +721,9 @@ namespace OpenSim m_log.Info("[SHUTDOWN]: Closing console and terminating"); m_sceneManager.Close(); - + WorldHasComeToAnEnd.Set(); - + base.Shutdown(); } diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index 2381f57..1b2600c 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs @@ -47,7 +47,7 @@ namespace OpenSim public delegate void ConsoleCommand(string[] comParams); public class OpenSimMainConsole : OpenSimMain, conscmd_callback - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected string m_startupCommandsFile; @@ -83,12 +83,12 @@ namespace OpenSim // // Called from app startup (OpenSim.Application) // - + m_log.Info("===================================================================="); m_log.Info("========================= STARTING OPENSIM ========================="); m_log.Info("===================================================================="); m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid")); - + m_console = CreateConsole(); MainConsole.Instance = m_console; InternalStartUp(); @@ -111,7 +111,7 @@ namespace OpenSim m_scriptTimer.Interval = 1200 * 1000; m_scriptTimer.Elapsed += RunAutoTimerScript; } - + PrintFileToConsole("startuplogo.txt"); } @@ -131,7 +131,7 @@ namespace OpenSim #region Console Commands /// - /// + /// /// /// private void RunCommandScript(string fileName) @@ -178,7 +178,7 @@ namespace OpenSim public override void RunCmd(string command, string[] cmdparams) { base.RunCmd(command, cmdparams); - + switch (command) { case "clear-assets": @@ -252,7 +252,7 @@ namespace OpenSim m_console.Notice("set-time [x] - set the current scene time phase"); m_console.Notice("show assets - show state of asset cache."); m_console.Notice("show users - show info about connected users."); - m_console.Notice("show modules - shows info about loaded modules."); + m_console.Notice("show modules - shows info about loaded modules."); m_console.Notice("show version - show the running build version."); m_console.Notice("threads - list threads"); m_console.Notice("config set section field value - set a config value"); @@ -264,7 +264,7 @@ namespace OpenSim case "threads": // m_console.Notice("THREAD", Process.GetCurrentProcess().Threads.Count + " threads running:"); // int _tc = 0; - + // foreach (ProcessThread pt in Process.GetCurrentProcess().Threads) // { // _tc++; @@ -388,7 +388,7 @@ namespace OpenSim if (m_sceneManager.TryGetScene(regName, out killScene)) { // only need to check this if we are not at the - // root level + // root level if ((m_sceneManager.CurrentScene != null) && (m_sceneManager.CurrentScene.RegionInfo.RegionID == killScene.RegionInfo.RegionID)) { @@ -520,7 +520,7 @@ namespace OpenSim { foreach (Scene s in new ArrayList(m_sceneManager.Scenes)) { - + m_console.Notice("Loading module: " + cmdparams[1]); m_moduleLoader.LoadRegionModules(cmdparams[1], s); } @@ -529,7 +529,7 @@ namespace OpenSim } } - break; + break; default: string[] tmpPluginArgs = new string[cmdparams.Length + 1]; cmdparams.CopyTo(tmpPluginArgs, 1); @@ -570,7 +570,7 @@ namespace OpenSim public override void Show(string ShowWhat) { base.Show(ShowWhat); - + switch (ShowWhat) { case "assets": diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 1eab16b..d6329ce 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -57,14 +57,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP // ~ClientView() // { - // m_log.Info("[CLIENTVIEW]: Destructor called"); + // m_log.Info("[CLIENTVIEW]: Destructor called"); // } /* static variables */ public static TerrainManager TerrainManager; public delegate bool SynchronizeClientHandler(IScene scene, Packet packet, LLUUID agentID, ThrottleOutPacketType throttlePacketType); - public static SynchronizeClientHandler SynchronizeClient = null; + public static SynchronizeClientHandler SynchronizeClient = null; /* private variables */ private readonly LLUUID m_sessionId; private LLUUID m_secureSessionId = LLUUID.Zero; @@ -201,7 +201,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private RemoveInventoryFolder handlerRemoveInventoryFolder = null; private RequestTaskInventory handlerRequestTaskInventory = null; //OnRequestTaskInventory; private UpdateTaskInventory handlerUpdateTaskInventory = null; //OnUpdateTaskInventory; - private MoveTaskInventory handlerMoveTaskItem = null; + private MoveTaskInventory handlerMoveTaskItem = null; private RemoveTaskInventory handlerRemoveTaskItem = null; //OnRemoveTaskItem; private RezScript handlerRezScript = null; //OnRezScript; private RequestMapBlocks handlerRequestMapBlocks = null; //OnRequestMapBlocks; @@ -324,7 +324,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /* METHODS */ public LLClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer, - AgentCircuitManager authenSessions, LLUUID agentId, LLUUID sessionId, uint circuitCode, EndPoint proxyEP) + AgentCircuitManager authenSessions, LLUUID agentId, LLUUID sessionId, uint circuitCode, EndPoint proxyEP) { m_moneyBalance = 1000; @@ -348,12 +348,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_userEndPoint = remoteEP; m_proxyEndPoint = proxyEP; - + m_startpos = m_authenticateSessionsHandler.GetPosition(circuitCode); // While working on this, the BlockingQueue had me fooled for a bit. - // The Blocking queue causes the thread to stop until there's something - // in it to process. It's an on-purpose threadlock though because + // The Blocking queue causes the thread to stop until there's something + // in it to process. It's an on-purpose threadlock though because // without it, the clientloop will suck up all sim resources. m_packetQueue = new LLPacketQueue(agentId); @@ -379,9 +379,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_scene.RemoveClient(AgentId); //m_log.InfoFormat("[CLIENTVIEW] Memory pre GC {0}", System.GC.GetTotalMemory(false)); - //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true)); + //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true)); - // Send the STOP packet + // Send the STOP packet DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator); OutPacket(disable, ThrottleOutPacketType.Unknown); @@ -398,12 +398,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP // flushing out all it's packets. There should probably // be a better mechanism here - // We can't reach into other scenes and close the connection + // We can't reach into other scenes and close the connection // We need to do this over grid communications //m_scene.CloseAllAgents(CircuitCode); // If we're not shutting down the circuit, then this is the last time we'll go here. - // If we are shutting down the circuit, the UDP Server will come back here with + // If we are shutting down the circuit, the UDP Server will come back here with // ShutDownCircuit = false if (!(shutdownCircuit)) { @@ -641,7 +641,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { //this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache); - // Establish our two timers. We could probably get this down to one + // Establish our two timers. We could probably get this down to one m_ackTimer = new Timer(750); m_ackTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed); m_ackTimer.Start(); @@ -791,7 +791,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event ParcelJoinRequest OnParcelJoinRequest; public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; public event ParcelSelectObjects OnParcelSelectObjects; - public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; + public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; public event ParcelAbandonRequest OnParcelAbandonRequest; public event RegionInfoRequest OnRegionInfoRequest; public event EstateCovenantRequest OnEstateCovenantRequest; @@ -834,7 +834,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP #region Scene/Avatar to Client /// - /// + /// /// /// public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) @@ -871,7 +871,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// public void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look) @@ -898,7 +898,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// /// @@ -934,17 +934,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP LLUUID imSessionID, string fromName, byte dialog, uint timeStamp) { SendInstantMessage( - fromAgent, fromAgentSession, message, toAgent, + fromAgent, fromAgentSession, message, toAgent, imSessionID, fromName, dialog, timeStamp, new byte[0]); } - + /// /// Send an instant message to this client /// /// /// public void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, - LLUUID imSessionID, string fromName, byte dialog, uint timeStamp, + LLUUID imSessionID, string fromName, byte dialog, uint timeStamp, byte[] binaryBucket) { if (((Scene)(this.m_scene)).ExternalChecks.ExternalChecksCanInstantMessage(fromAgent, toAgent)) @@ -1031,7 +1031,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// /// @@ -1056,7 +1056,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// public AgentCircuitData RequestClientInfo() @@ -1166,7 +1166,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// public void SendTeleportFailed(string reason) { @@ -1179,7 +1179,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// public void SendTeleportLocationStart() { @@ -1250,7 +1250,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// Send information about the items contained in a folder to the client. - /// + /// /// XXX This method needs some refactoring loving /// /// The owner of the folder @@ -1261,8 +1261,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List items, List folders, bool fetchFolders, bool fetchItems) - { - // An inventory descendents packet consists of a single agent section and an inventory details + { + // An inventory descendents packet consists of a single agent section and an inventory details // section for each inventory item. The size of each inventory item is approximately 550 bytes. // In theory, UDP has a maximum packet size of 64k, so it should be possible to send descendent // packets containing metadata for in excess of 100 items. But in practice, there may be other @@ -1367,7 +1367,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (i < MAX_ITEMS_PER_PACKET) { - + OutPacket(descend, ThrottleOutPacketType.Asset); } } @@ -1376,7 +1376,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (fetchFolders) { InventoryDescendentsPacket descend = CreateInventoryDescendentsPacket(ownerID, folderID); - + if (folders.Count < MAX_ITEMS_PER_PACKET) { descend.FolderData = new InventoryDescendentsPacket.FolderDataBlock[folders.Count]; @@ -1493,27 +1493,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP inventoryReply.Header.Zerocoded = true; OutPacket(inventoryReply, ThrottleOutPacketType.Asset); } - + /// IClientAPI.SendBulkUpdateInventory(InventoryItemBase) - public void SendBulkUpdateInventory(InventoryItemBase item) - { + public void SendBulkUpdateInventory(InventoryItemBase item) + { uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; - - BulkUpdateInventoryPacket bulkUpdate + + BulkUpdateInventoryPacket bulkUpdate = (BulkUpdateInventoryPacket)PacketPool.Instance.GetPacket(PacketType.BulkUpdateInventory); - + bulkUpdate.AgentData.AgentID = AgentId; - bulkUpdate.AgentData.TransactionID = LLUUID.Random(); - + bulkUpdate.AgentData.TransactionID = LLUUID.Random(); + bulkUpdate.FolderData = new BulkUpdateInventoryPacket.FolderDataBlock[1]; bulkUpdate.FolderData[0] = new BulkUpdateInventoryPacket.FolderDataBlock(); bulkUpdate.FolderData[0].FolderID = LLUUID.Zero; bulkUpdate.FolderData[0].ParentID = LLUUID.Zero; bulkUpdate.FolderData[0].Type = -1; bulkUpdate.FolderData[0].Name = new byte[0]; - + bulkUpdate.ItemData = new BulkUpdateInventoryPacket.ItemDataBlock[1]; - bulkUpdate.ItemData[0] = new BulkUpdateInventoryPacket.ItemDataBlock(); + bulkUpdate.ItemData[0] = new BulkUpdateInventoryPacket.ItemDataBlock(); bulkUpdate.ItemData[0].ItemID = item.ID; bulkUpdate.ItemData[0].AssetID = item.AssetID; bulkUpdate.ItemData[0].CreatorID = item.Creator; @@ -1553,11 +1553,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendInventoryItemCreateUpdate(InventoryItemBase Item) { uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; - - UpdateCreateInventoryItemPacket InventoryReply + + UpdateCreateInventoryItemPacket InventoryReply = (UpdateCreateInventoryItemPacket)PacketPool.Instance.GetPacket( PacketType.UpdateCreateInventoryItem); - + // TODO: don't create new blocks if recycling an old packet InventoryReply.AgentData.AgentID = AgentId; InventoryReply.AgentData.SimApproved = true; @@ -1719,7 +1719,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// /// On the linden client, if this true then it displays a one button text box placed in the - /// middle of the window. If false, the message is displayed in a brief duration blue information box (as for + /// middle of the window. If false, the message is displayed in a brief duration blue information box (as for /// the AlertMessage packet). public void SendAgentAlertMessage(string message, bool modal) { @@ -1784,7 +1784,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP sound.DataBlock.OwnerID = ownerID; sound.DataBlock.Gain = gain; sound.DataBlock.Flags = flags; - + OutPacket(sound, ThrottleOutPacketType.Task); } @@ -1907,7 +1907,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP #region Appearance/ Wearables Methods /// - /// + /// /// /// public void SendWearables(AvatarWearable[] wearables, int serial) @@ -1933,7 +1933,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// /// @@ -2016,7 +2016,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// /// @@ -2071,14 +2071,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP #region Primitive Packet/data Sending Methods /// - /// + /// /// /// /// /// public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint) { - + ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach); Console.WriteLine("Attach object!"); // TODO: don't create new blocks if recycling an old packet @@ -2094,9 +2094,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP } public void SendPrimitiveToClient( - ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, + ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, - uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, + uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction) { byte[] textureanim = new byte[0]; @@ -2108,7 +2108,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } public void SendPrimitiveToClient( - ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, + ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 velocity, LLVector3 acceleration, LLQuaternion rotation, LLVector3 rotational_velocity, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, @@ -2125,15 +2125,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP outPacket.ObjectData[0].ID = localID; outPacket.ObjectData[0].FullID = objectID; outPacket.ObjectData[0].OwnerID = ownerID; - + // Anything more than 255 will cause libsecondlife to barf if (text.Length > 255) { text = text.Remove(255); } - + outPacket.ObjectData[0].Text = Helpers.StringToField(text); - + outPacket.ObjectData[0].TextColor[0] = color[0]; outPacket.ObjectData[0].TextColor[1] = color[1]; outPacket.ObjectData[0].TextColor[2] = color[2]; @@ -2148,7 +2148,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // Necessary??? outPacket.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 2); outPacket.ObjectData[0].JointPivot = new LLVector3(0, 0, 0); - + // Item from inventory??? outPacket.ObjectData[0].NameValue = Helpers.StringToField("AttachItemID STRING RW SV " + AssetId.UUID); @@ -2179,7 +2179,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// /// @@ -2194,7 +2194,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP terse.RegionData.RegionHandle = regionHandle; terse.RegionData.TimeDilation = timeDilation; terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; - terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, state); // AssetID should fall into here probably somehow... + terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, state); // AssetID should fall into here probably somehow... terse.Header.Reliable = false; terse.Header.Zerocoded = true; OutPacket(terse, ThrottleOutPacketType.Task); @@ -2251,7 +2251,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (ImageSize > 0) im.ImageID.Size = ImageSize; - + im.ImageData.Data = ImageData; im.ImageID.Codec = imageCodec; im.Header.Zerocoded = true; @@ -2270,7 +2270,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendObjectPropertiesFamilyData(uint RequestFlags, LLUUID ObjectUUID, LLUUID OwnerID, LLUUID GroupID, uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, - uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category, + uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category, LLUUID LastOwnerID, string ObjectName, string Description) { ObjectPropertiesFamilyPacket objPropFamilyPack = (ObjectPropertiesFamilyPacket)PacketPool.Instance.GetPacket(PacketType.ObjectPropertiesFamily); @@ -2301,9 +2301,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP } public void SendObjectPropertiesReply(LLUUID ItemID, ulong CreationDate, LLUUID CreatorUUID, LLUUID FolderUUID, LLUUID FromTaskUUID, - LLUUID GroupUUID, short InventorySerial, LLUUID LastOwnerUUID, LLUUID ObjectUUID, - LLUUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, - string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, + LLUUID GroupUUID, short InventorySerial, LLUUID LastOwnerUUID, LLUUID ObjectUUID, + LLUUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName, + string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask, uint BaseMask) { ObjectPropertiesPacket proper = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties); @@ -2409,7 +2409,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP rinfoblk.WaterHeight = args.waterHeight; rinfoblk.SimName = Helpers.StringToField(args.simName); - + rinfopack.RegionInfo = rinfoblk; this.OutPacket(rinfopack, ThrottleOutPacketType.Task); @@ -2638,7 +2638,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP notifyCount = 32; } - + ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount]; @@ -2758,7 +2758,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// /// @@ -2852,8 +2852,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP bytes[i++] = (byte)(rvelz % 256); bytes[i++] = (byte)((rvelz >> 8) % 256); dat.Data = bytes; - - + + return dat; } @@ -2931,7 +2931,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// - /// + /// /// /// public ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry) @@ -2966,7 +2966,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// protected void SetDefaultAvatarPacketValues(ref ObjectUpdatePacket.ObjectDataBlock objdata) @@ -3093,7 +3093,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return true; } - + public void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question) { ScriptQuestionPacket scriptQuestion = (ScriptQuestionPacket)PacketPool.Instance.GetPacket(PacketType.ScriptQuestion); @@ -3136,7 +3136,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// Send a response back to a client when it asks the asset server (via the region server) if it has /// its appearance texture cached. - /// + /// /// At the moment, we always reply that there is no cached texture. /// /// @@ -3154,7 +3154,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_cachedTextureSerial++; cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length]; - + for (int i = 0; i < cachedtex.WearableData.Length; i++) { cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock(); @@ -3162,8 +3162,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP cachedresp.WearableData[i].TextureID = LLUUID.Zero; cachedresp.WearableData[i].HostName = new byte[0]; } - - // Temporarily throw these packets on to the wind queue, so we can identify whether these + + // Temporarily throw these packets on to the wind queue, so we can identify whether these // are somehow the source of the packet bloat. cachedresp.Header.Zerocoded = true; OutPacket(cachedresp, ThrottleOutPacketType.Wind); @@ -3245,7 +3245,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); handlerUpdatePrimScale(localId, scale1, this); - + handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; if (handlerUpdatePrimSinglePosition != null) { @@ -3414,7 +3414,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // Previously ClientView.m_packetQueue - // A thread safe sequence number allocator. + // A thread safe sequence number allocator. protected uint NextSeqNum() { // Set the sequence number @@ -3490,7 +3490,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { // Keep track of when this packet was sent out Pack.TickCount = System.Environment.TickCount; - + if (!Pack.Header.Resent) { Pack.Header.Sequence = NextSeqNum(); @@ -3510,7 +3510,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP try { byte[] sendbuffer = Pack.ToBytes(); - PacketPool.Instance.ReturnPacket(Pack); + PacketPool.Instance.ReturnPacket(Pack); if (Pack.Header.Zerocoded) { @@ -3737,7 +3737,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } - private bool m_packetProcessingEnabled = true; + private bool m_packetProcessingEnabled = true; public bool IsActive { get { return m_packetProcessingEnabled; } @@ -3750,7 +3750,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (ProcessPacketMethod(Pack)) { - //there is a handler registered that handled this packet type + //there is a handler registered that handled this packet type return; } else @@ -3972,7 +3972,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { // Temporarily protect ourselves from the mantis #951 failure. // However, we could do this for several other handlers where a failure isn't terminal - // for the client session anyway, in order to protect ourselves against bad code in plugins + // for the client session anyway, in order to protect ourselves against bad code in plugins try { List visualparams = new List(); @@ -3986,7 +3986,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP catch (Exception e) { m_log.ErrorFormat( - "[CLIENT VIEW]: AgentSetApperance packet handler threw an exception, {0}", + "[CLIENT VIEW]: AgentSetApperance packet handler threw an exception, {0}", e); } } @@ -4027,7 +4027,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (handlerDetachAttachmentIntoInv != null) { DetachAttachmentIntoInvPacket detachtoInv = (DetachAttachmentIntoInvPacket)Pack; - + LLUUID itemID = detachtoInv.ObjectData.ItemID; LLUUID ATTACH_agentID = detachtoInv.ObjectData.AgentID; @@ -4223,7 +4223,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_probesWithNoIngressPackets = 0; m_clientBlocked = false; SendStartPingCheck(0); - + break; case PacketType.ForceScriptControlRelease: @@ -4284,12 +4284,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP // m_log.Info("[REZData]: " + addPacket.ToString()); //BypassRaycast: 1 //RayStart: <69.79469, 158.2652, 98.40343> - //RayEnd: <61.97724, 141.995, 92.58341> + //RayEnd: <61.97724, 141.995, 92.58341> //RayTargetID: 00000000-0000-0000-0000-000000000000 //Check to see if adding the prim is allowed; useful for any module wanting to restrict the //object from rezing initially - + handlerAddPrim = OnAddPrim; if (handlerAddPrim != null) handlerAddPrim(AgentId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape, addPacket.ObjectData.BypassRaycast, addPacket.ObjectData.RayStart, addPacket.ObjectData.RayTargetID, addPacket.ObjectData.RayEndIsIntersection); @@ -4532,10 +4532,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } - // Here's our data, + // Here's our data, // PermField contains the field the info goes into // PermField determines which mask we're changing - // + // // chmask is the mask of the change // setTF is whether we're adding it or taking it away // @@ -4969,11 +4969,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } } - + break; - + case PacketType.RemoveTaskInventory: - + RemoveTaskInventoryPacket removeTask = (RemoveTaskInventoryPacket)Pack; handlerRemoveTaskItem = OnRemoveTaskItem; @@ -4982,27 +4982,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP { handlerRemoveTaskItem(this, removeTask.InventoryData.ItemID, removeTask.InventoryData.LocalID); } - + break; - + case PacketType.MoveTaskInventory: - + MoveTaskInventoryPacket moveTaskInventoryPacket = (MoveTaskInventoryPacket)Pack; - + handlerMoveTaskItem = OnMoveTaskItem; - + if (handlerMoveTaskItem != null) { handlerMoveTaskItem( - this, moveTaskInventoryPacket.AgentData.FolderID, - moveTaskInventoryPacket.InventoryData.LocalID, + this, moveTaskInventoryPacket.AgentData.FolderID, + moveTaskInventoryPacket.InventoryData.LocalID, moveTaskInventoryPacket.InventoryData.ItemID); } - + break; - + case PacketType.RezScript: - + //Console.WriteLine(Pack.ToString()); RezScriptPacket rezScriptx = (RezScriptPacket)Pack; @@ -5013,7 +5013,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP handlerRezScript(this, rezScriptx.InventoryBlock.ItemID, rezScriptx.UpdateBlock.ObjectLocalID); } break; - + case PacketType.MapLayerRequest: RequestMapLayer(); break; @@ -5054,7 +5054,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP tpCancel.Info.AgentID = tpReq.Info.AgentID; OutPacket(tpCancel, ThrottleOutPacketType.Task); } - + try { @@ -5072,7 +5072,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } else { - + // Teleport home request handlerTeleportHomeRequest = OnTeleportHomeRequest; if (handlerTeleportHomeRequest != null) @@ -5121,7 +5121,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP #endregion - + case PacketType.UUIDNameRequest: UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack; foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock) @@ -5262,7 +5262,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP break; case PacketType.ParcelRelease: ParcelReleasePacket releasePacket = (ParcelReleasePacket)Pack; - + handlerParcelAbandonRequest = OnParcelAbandonRequest; if (handlerParcelAbandonRequest != null) { @@ -5378,7 +5378,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP float SunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(messagePacket.ParamList[5].Parameter)); OnSetRegionTerrainSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseFixedSun, SunHour); - + } catch (Exception ex) { @@ -5462,7 +5462,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP LLUUID Prey = LLUUID.Zero; Helpers.TryParse(Helpers.FieldToUTF8String(messagePacket.ParamList[1].Parameter), out Prey); - + OnEstateTeleportOneUserHomeRequest(this,invoice,SenderID,Prey); } break; @@ -5500,7 +5500,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP RequestGodlikePowersPacket rglpPack = (RequestGodlikePowersPacket)Pack; RequestGodlikePowersPacket.RequestBlockBlock rblock = rglpPack.RequestBlock; LLUUID token = rblock.Token; - + RequestGodlikePowersPacket.AgentDataBlock ablock = rglpPack.AgentData; handlerReqGodlikePowers = OnRequestGodlikePowers; @@ -5623,7 +5623,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // TODO: Don't display this one, we handle it at a lower level //m_log.Warn("[CLIENT]: unhandled UseCircuitCode packet"); break; - + case PacketType.AgentHeightWidth: // TODO: handle this packet m_log.Warn("[CLIENT]: unhandled AgentHeightWidth packet"); @@ -5741,7 +5741,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP OutPacket(offp, ThrottleOutPacketType.Task); } - public void SendSitResponse(LLUUID TargetID, LLVector3 OffsetPos, LLQuaternion SitOrientation, bool autopilot, + public void SendSitResponse(LLUUID TargetID, LLVector3 OffsetPos, LLQuaternion SitOrientation, bool autopilot, LLVector3 CameraAtOffset, LLVector3 CameraEyeOffset, bool ForceMouseLook) { AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket(); @@ -5766,7 +5766,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP GrantGodlikePowersPacket.AgentDataBlock adb = new GrantGodlikePowersPacket.AgentDataBlock(); adb.AgentID = AgentId; - adb.SessionID = SessionId; // More security + adb.SessionID = SessionId; // More security gdb.GodLevel = (byte)AdminLevel; gdb.Token = Token; //respondPacket.AgentData = (GrantGodlikePowersPacket.AgentDataBlock)ablock; @@ -5790,7 +5790,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP Group.GroupPowers = GroupMembership[i].groupPowers; Groups[i] = Group; Groupupdate.GroupData = Groups; - + } Groupupdate.AgentData.AgentID = AgentId; OutPacket(Groupupdate, ThrottleOutPacketType.Task); @@ -5800,7 +5800,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public ClientInfo GetClientInfo() { //MainLog.Instance.Verbose("CLIENT", "GetClientInfo BGN"); - + ClientInfo info = new ClientInfo(); info.userEP = this.m_userEndPoint; info.proxyEP = this.m_proxyEndPoint; @@ -5822,7 +5822,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP QueItem[] queitems = m_packetQueue.GetQueueArray(); MainLog.Instance.Verbose("CLIENT", "Queue Count : [{0}]", queitems.Length); - + for (int i = 0; i < queitems.Length; i++) { if (queitems[i].Incoming == false) @@ -5862,7 +5862,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } catch (Exception) { - + } m_needAck.Add(key, packet); diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index 8f90f34..8655d80 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs @@ -79,14 +79,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP // private long LastThrottle; // private long ThrottleInterval; private Timer throttleTimer; - + private LLUUID m_agentId; public LLPacketQueue(LLUUID agentId) { // While working on this, the BlockingQueue had me fooled for a bit. - // The Blocking queue causes the thread to stop until there's something - // in it to process. it's an on-purpose threadlock though because + // The Blocking queue causes the thread to stop until there's something + // in it to process. it's an on-purpose threadlock though because // without it, the clientloop will suck up all sim resources. SendQueue = new BlockingQueue(); @@ -111,7 +111,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP AssetThrottle = new LLPacketThrottle(1000, 800000, 1000); TextureThrottle = new LLPacketThrottle(1000, 800000, 4000); // Total Throttle trumps all - // Number of bytes allowed to go out per second. (256kbps per client) + // Number of bytes allowed to go out per second. (256kbps per client) TotalThrottle = new LLPacketThrottle(0, 1500000, 28000); throttleTimer = new Timer((int) (throttletimems/throttleTimeDivisor)); @@ -121,10 +121,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP // TIMERS needed for this // LastThrottle = DateTime.Now.Ticks; // ThrottleInterval = (long)(throttletimems/throttleTimeDivisor); - + m_agentId = agentId; - - if (StatsManager.SimExtraStats != null) + + if (StatsManager.SimExtraStats != null) { StatsManager.SimExtraStats.RegisterPacketQueueStatsProvider(m_agentId, this); } @@ -234,11 +234,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_enabled = false; throttleTimer.Stop(); - - if (StatsManager.SimExtraStats != null) + + if (StatsManager.SimExtraStats != null) { StatsManager.SimExtraStats.DeregisterPacketQueueStatsProvider(m_agentId); - } + } } private void ResetCounters() @@ -275,7 +275,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP int MaxThrottleLoops = 4550; // 50*7 packets can be dequeued at once. int throttleLoops = 0; - // We're going to dequeue all of the saved up packets until + // We're going to dequeue all of the saved up packets until // we've hit the throttle limit or there's no more packets to send lock (this) { @@ -428,8 +428,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP //Agent Throttle Block contains 7 single floatingpoint values. int j = 0; - // Some Systems may be big endian... - // it might be smart to do this check more often... + // Some Systems may be big endian... + // it might be smart to do this check more often... if (!BitConverter.IsLittleEndian) for (int i = 0; i < 7; i++) Array.Reverse(throttle, j + i*singlefloat, singlefloat); @@ -508,7 +508,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // effectively wiggling the slider causes things reset ResetCounters(); } - + // See IPullStatsProvider public string GetStats() { @@ -522,7 +522,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP CloudOutgoingPacketQueue.Count, TaskOutgoingPacketQueue.Count, TextureOutgoingPacketQueue.Count, - AssetOutgoingPacketQueue.Count); + AssetOutgoingPacketQueue.Count); } public LLQueItem[] GetQueueArray() diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs index 6a033c8..5983454 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs @@ -37,7 +37,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { public class LLPacketServer { - //private static readonly log4net.ILog m_log + //private static readonly log4net.ILog m_log // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private LLClientStackNetworkHandler m_networkHandler; @@ -61,7 +61,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// /// @@ -112,7 +112,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// /// @@ -124,7 +124,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } /// - /// + /// /// /// public virtual void CloseCircuit(uint circuitcode) @@ -141,9 +141,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP public virtual void CloseClient(IClientAPI client) { //m_log.Info("PacketServer:CloseClient()"); - + CloseCircuit(client.CircuitCode); - m_scene.ClientManager.Remove(client.CircuitCode); + m_scene.ClientManager.Remove(client.CircuitCode); client.Close(false); } } diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 5f83b50..c413416 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -171,11 +171,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); - // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. + // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. // so therefore.. we've got to tell the server to BeginReceiveFrom again. - // This will happen over and over until we've gone through all packets + // This will happen over and over until we've gone through all packets // sent to and from this particular user. - // Stupid I know.. + // Stupid I know.. // but Flusing the buffer would be even more stupid... so, we're stuck with this ugly method. } catch (SocketException) @@ -195,12 +195,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP { m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); - - // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. + + // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. // so therefore.. we've got to tell the server to BeginReceiveFrom again. - // This will happen over and over until we've gone through all packets + // This will happen over and over until we've gone through all packets // sent to and from this particular user. - // Stupid I know.. + // Stupid I know.. // but Flusing the buffer would be even more stupid... so, we're stuck with this ugly method. } catch (SocketException e2) @@ -208,7 +208,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_log.Error("[UDPSERVER]: " + e2.ToString()); } - // Here's some reference code! :D + // Here's some reference code! :D // Shutdown and restart the UDP listener! hehe // Shiny @@ -228,11 +228,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); - // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. + // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. // so therefore.. we've got to tell the server to BeginReceiveFrom again. - // This will happen over and over until we've gone through all packets + // This will happen over and over until we've gone through all packets // sent to and from this particular user. - // Stupid I know.. + // Stupid I know.. // but Flusing the buffer would be even more stupid... so, we're stuck with this ugly method. } @@ -283,11 +283,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); - // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. + // Ter: For some stupid reason ConnectionReset basically kills our async event structure.. // so therefore.. we've got to tell the server to BeginReceiveFrom again. - // This will happen over and over until we've gone through all packets + // This will happen over and over until we've gone through all packets // sent to and from this particular user. - // Stupid I know.. + // Stupid I know.. // but Flusing the buffer would be even more stupid... so, we're stuck with this ugly method. } catch (SocketException e5) @@ -351,7 +351,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } } - + } private void CloseEndPoint(EndPoint sender) @@ -468,7 +468,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void RestoreClient(AgentCircuitData circuit, EndPoint userEP, EndPoint proxyEP) { //MainLog.Instance.Verbose("UDPSERVER", "RestoreClient"); - + UseCircuitCodePacket useCircuit = new UseCircuitCodePacket(); useCircuit.CircuitCode.Code = circuit.circuitcode; useCircuit.CircuitCode.ID = circuit.AgentID; diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index b16f74b..586384f 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.ClientStack { public abstract class RegionApplicationBase : BaseOpenSimServer { - private static readonly ILog m_log + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected AssetCache m_assetCache; @@ -63,7 +63,7 @@ namespace OpenSim.Region.ClientStack protected StorageManager m_storageManager; protected string m_storageConnectionString; - + // An attribute to indicate whether prim inventories should be persisted. // Probably will be temporary until this stops being experimental. protected bool m_storagePersistPrimInventories; @@ -159,9 +159,9 @@ namespace OpenSim.Region.ClientStack scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero; } - scene.LoadPrimsFromStorage(regionInfo.originRegionID); + scene.LoadPrimsFromStorage(regionInfo.originRegionID); scene.StartTimer(); - + return scene; } diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index 39cf911..0203821 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs @@ -165,7 +165,7 @@ namespace OpenSim.Region.Communications.Local } /// - /// + /// /// /// /// @@ -188,7 +188,7 @@ namespace OpenSim.Region.Communications.Local } /// - /// + /// /// /// /// @@ -305,7 +305,7 @@ namespace OpenSim.Region.Communications.Local } /// - /// + /// /// /// /// @@ -338,7 +338,7 @@ namespace OpenSim.Region.Communications.Local } /// - /// + /// /// /// /// diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index 3d87007..4f60462 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs @@ -37,20 +37,20 @@ namespace OpenSim.Region.Communications.Local { /// /// An implementation of user inventory where the inventory is held locally (e.g. when OpenSim is - /// operating in standalone mode. + /// operating in standalone mode. /// public class LocalInventoryService : InventoryServiceBase { - private static readonly ILog m_log + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) { m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID); - - List skeletonFolders = GetInventorySkeleton(userID); + + List skeletonFolders = GetInventorySkeleton(userID); InventoryFolderImpl rootFolder = null; - + List folders = new List(); List items = new List(); @@ -76,11 +76,11 @@ namespace OpenSim.Region.Communications.Local } } } - + m_log.InfoFormat( - "[LOCAL INVENTORY SERVICE]: Received inventory response for user {0} containing {1} folders and {2} items", + "[LOCAL INVENTORY SERVICE]: Received inventory response for user {0} containing {1} folders and {2} items", userID, folders.Count, items.Count); - + callback(folders, items); } diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 1781ef8..966fdd4 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.Communications.Local public class LocalLoginService : LoginService { - private static readonly ILog m_log + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private CommunicationsLocal m_Parent; @@ -55,8 +55,8 @@ namespace OpenSim.Region.Communications.Local private LoginToRegionEvent handlerLoginToRegion = null; // OnLoginToRegion; - public LocalLoginService(UserManagerBase userManager, string welcomeMess, - CommunicationsLocal parent, NetworkServersInfo serversInfo, + public LocalLoginService(UserManagerBase userManager, string welcomeMess, + CommunicationsLocal parent, NetworkServersInfo serversInfo, bool authenticate) : base(userManager, parent.UserProfileCacheService.libraryRoot, welcomeMess) { @@ -106,7 +106,7 @@ namespace OpenSim.Region.Communications.Local { m_log.Info( "[LOGIN]: Authenticating " + profile.FirstName + " " + profile.SurName); - + if (!password.StartsWith("$1$")) password = "$1$" + Util.Md5Hash(password); @@ -157,7 +157,7 @@ namespace OpenSim.Region.Communications.Local RegionInfo r = m_Parent.GridService.RequestClosestRegion(region); if (null == r) { - m_log.InfoFormat("[LOGIN]: Got Custom Login URL {0}, can't locate region {1}", + m_log.InfoFormat("[LOGIN]: Got Custom Login URL {0}, can't locate region {1}", startLocationRequest, region); } else @@ -176,16 +176,16 @@ namespace OpenSim.Region.Communications.Local if ((homeReg != null) && (reg != null)) { - response.Home = "{'region_handle':[r" + + response.Home = "{'region_handle':[r" + (homeReg.RegionLocX * Constants.RegionSize).ToString() + ",r" + (homeReg.RegionLocY * Constants.RegionSize).ToString() + "], " + - "'position':[r" + - theUser.HomeLocation.X.ToString() + ",r" + - theUser.HomeLocation.Y.ToString() + ",r" + + "'position':[r" + + theUser.HomeLocation.X.ToString() + ",r" + + theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "], " + - "'look_at':[r" + - theUser.HomeLocation.X.ToString() + ",r" + - theUser.HomeLocation.Y.ToString() + ",r" + + "'look_at':[r" + + theUser.HomeLocation.X.ToString() + ",r" + + theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}"; string capsPath = Util.GetRandomCapsPath(); response.SimAddress = reg.ExternalEndPoint.Address.ToString(); @@ -201,17 +201,17 @@ namespace OpenSim.Region.Communications.Local response.SeedCapability = "http://" + reg.ExternalHostName + ":" + serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; - + m_log.DebugFormat( - "[CAPS]: Sending new CAPS seed url {0} to client {1}", - response.SeedCapability, response.AgentID); + "[CAPS]: Sending new CAPS seed url {0} to client {1}", + response.SeedCapability, response.AgentID); theUser.CurrentAgent.Region = reg.RegionID; theUser.CurrentAgent.Handle = reg.RegionHandle; LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList(); - response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.ID)); + response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.ID)); Login _login = new Login(); //copy data to login object @@ -228,9 +228,9 @@ namespace OpenSim.Region.Communications.Local _login.CapsPath = capsPath; m_log.InfoFormat( - "[LOGIN]: Telling region {0} @ {1},{2} ({3}:{4}) to expect user connection", - reg.RegionName, response.RegionX, response.RegionY, response.SimAddress, response.SimPort); - + "[LOGIN]: Telling region {0} @ {1},{2} ({3}:{4}) to expect user connection", + reg.RegionName, response.RegionX, response.RegionY, response.SimAddress, response.SimPort); + handlerLoginToRegion = OnLoginToRegion; if (handlerLoginToRegion != null) { @@ -257,7 +257,7 @@ namespace OpenSim.Region.Communications.Local return buddylistreturn; } - // See LoginService + // See LoginService protected override InventoryData GetInventorySkeleton(LLUUID userID) { List folders = m_Parent.InventoryService.GetInventorySkeleton(userID); @@ -265,10 +265,10 @@ namespace OpenSim.Region.Communications.Local // If we have user auth but no inventory folders for some reason, create a new set of folders. if (null == folders || 0 == folders.Count) { - m_Parent.InventoryService.CreateNewUserInventory(userID); + m_Parent.InventoryService.CreateNewUserInventory(userID); folders = m_Parent.InventoryService.GetInventorySkeleton(userID); } - + LLUUID rootID = LLUUID.Zero; ArrayList AgentInventoryArray = new ArrayList(); Hashtable TempHash; @@ -286,7 +286,7 @@ namespace OpenSim.Region.Communications.Local TempHash["folder_id"] = InvFolder.ID.ToString(); AgentInventoryArray.Add(TempHash); } - + return new InventoryData(AgentInventoryArray, rootID); } } diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 2a66edc..47f596d 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.Communications.Local private IInventoryServices m_inventoryService; /// - /// + /// /// /// /// diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs index 2c88586..8712c00 100644 --- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,11 +54,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly : AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index fb8dcf6..5e7e238 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -95,9 +95,9 @@ namespace OpenSim.Region.Communications.OGS1 public RegionCommsListener RegisterRegion(RegionInfo regionInfo) { m_log.InfoFormat( - "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}", + "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}", regionInfo.RegionName, serversInfo.GridURL); - + Hashtable GridParams = new Hashtable(); // Login / Authentication @@ -122,7 +122,7 @@ namespace OpenSim.Region.Communications.OGS1 // not at all. Current strategy is to put the code in place to support the validity of this information // and to roll forward debugging any issues from that point // - // this particular section of the mod attempts to supply a value from the region's xml file to the grid + // this particular section of the mod attempts to supply a value from the region's xml file to the grid // server for the UUID of the region's owner (master avatar) GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); @@ -139,14 +139,14 @@ namespace OpenSim.Region.Communications.OGS1 } catch (Exception e) { - Exception e2 + Exception e2 = new Exception( String.Format("Unable to connect to grid at {0}. Grid service not running?", serversInfo.GridURL), e); - + throw(e2); } - + Hashtable GridRespData = (Hashtable)GridResp.Value; Hashtable griddatahash = GridRespData; @@ -154,9 +154,9 @@ namespace OpenSim.Region.Communications.OGS1 if (GridRespData.ContainsKey("error")) { string errorstring = (string) GridRespData["error"]; - + Exception e = new Exception(String.Format("Unable to connect to grid at {0}: {1}", serversInfo.GridURL, errorstring)); - + throw e; } else @@ -170,9 +170,9 @@ namespace OpenSim.Region.Communications.OGS1 m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE"); } } - + m_log.InfoFormat( - "[OGS1 GRID SERVICES]: Region {0} successfully registered with grid at {1}", + "[OGS1 GRID SERVICES]: Region {0} successfully registered with grid at {1}", regionInfo.RegionName, serversInfo.GridURL); } return m_localBackend.RegisterRegion(regionInfo); @@ -245,7 +245,7 @@ namespace OpenSim.Region.Communications.OGS1 string externalIpStr = String.Empty; try - { + { externalIpStr = Util.GetHostFromDNS(simIp).ToString(); } catch (SocketException e) @@ -253,16 +253,16 @@ namespace OpenSim.Region.Communications.OGS1 m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list. {1}", simIp, e); continue; } - + SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port); - + sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]); - + if (neighbourData.ContainsKey("http_port")) { sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]); } - + sri.RegionID = new LLUUID((string) neighbourData["uuid"]); neighbours.Add(sri); @@ -274,7 +274,7 @@ namespace OpenSim.Region.Communications.OGS1 } /// - /// + /// /// /// /// @@ -309,7 +309,7 @@ namespace OpenSim.Region.Communications.OGS1 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); regionInfo.RemotingAddress = internalIpStr; - + if (responseData.ContainsKey("http_port")) { regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); @@ -327,7 +327,7 @@ namespace OpenSim.Region.Communications.OGS1 } /// - /// + /// /// /// /// @@ -372,7 +372,7 @@ namespace OpenSim.Region.Communications.OGS1 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); regionInfo.RemotingAddress = internalIpStr; - + if (responseData.ContainsKey("http_port")) { regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); @@ -429,7 +429,7 @@ namespace OpenSim.Region.Communications.OGS1 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); regionInfo.RemotingAddress = internalIpStr; - + if (responseData.ContainsKey("http_port")) { regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); @@ -451,7 +451,7 @@ namespace OpenSim.Region.Communications.OGS1 } /// - /// + /// /// /// /// @@ -601,7 +601,7 @@ namespace OpenSim.Region.Communications.OGS1 #region m_interRegion Comms /// - /// + /// /// private void StartRemoting() { @@ -688,55 +688,55 @@ namespace OpenSim.Region.Communications.OGS1 catch (RemotingException e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } catch (SocketException e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } catch (InvalidCredentialException e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } catch (AuthenticationException e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } catch (Exception e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat("[OGS1 GRID SERVICES]: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } } @@ -748,7 +748,7 @@ namespace OpenSim.Region.Communications.OGS1 } /// - /// + /// /// /// /// @@ -797,56 +797,56 @@ namespace OpenSim.Region.Communications.OGS1 catch (RemotingException e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } catch (SocketException e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } catch (InvalidCredentialException e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } catch (AuthenticationException e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } catch (Exception e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } } @@ -857,17 +857,17 @@ namespace OpenSim.Region.Communications.OGS1 SerializableRegionInfo regInfo = null; try { - // You may ask why this is in here... - // The region asking the grid services about itself.. - // And, surprisingly, the reason is.. it doesn't know + // You may ask why this is in here... + // The region asking the grid services about itself.. + // And, surprisingly, the reason is.. it doesn't know // it's own remoting port! How special. RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); region = new SerializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); - region.RemotingAddress = region.ExternalHostName; - region.RemotingPort = NetworkServersInfo.RemotingListenerPort; + region.RemotingAddress = region.ExternalHostName; + region.RemotingPort = NetworkServersInfo.RemotingListenerPort; region.HttpPort = serversInfo.HttpListenerPort; - + if (m_localBackend.RegionUp(region, regionhandle)) { return true; @@ -904,7 +904,7 @@ namespace OpenSim.Region.Communications.OGS1 } else { - // We're trying to inform ourselves via remoting. + // We're trying to inform ourselves via remoting. // This is here because we're looping over the listeners before we get here. // Odd but it should work. return true; @@ -963,7 +963,7 @@ namespace OpenSim.Region.Communications.OGS1 } /// - /// + /// /// /// /// @@ -1058,7 +1058,7 @@ namespace OpenSim.Region.Communications.OGS1 } /// - /// + /// /// /// /// @@ -1098,20 +1098,20 @@ namespace OpenSim.Region.Communications.OGS1 return retValue; } - //TODO need to see if we know about where this region is and use .net remoting - // to inform it. + //TODO need to see if we know about where this region is and use .net remoting + // to inform it. NoteDeadRegion(regionHandle); return false; } catch (RemotingException e) { NoteDeadRegion(regionHandle); - + m_log.WarnFormat( "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); - + return false; } catch @@ -1155,8 +1155,8 @@ namespace OpenSim.Region.Communications.OGS1 return retValue; } - //TODO need to see if we know about where this region is and use .net remoting - // to inform it. + //TODO need to see if we know about where this region is and use .net remoting + // to inform it. NoteDeadRegion(regionHandle); return false; } @@ -1184,7 +1184,7 @@ namespace OpenSim.Region.Communications.OGS1 catch (AuthenticationException e) { NoteDeadRegion(regionHandle); - m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region: " + regionHandle); + m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region: " + regionHandle); m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); return false; } @@ -1230,8 +1230,8 @@ namespace OpenSim.Region.Communications.OGS1 return true; } - //TODO need to see if we know about where this region is and use .net remoting - // to inform it. + //TODO need to see if we know about where this region is and use .net remoting + // to inform it. NoteDeadRegion(regionHandle); return false; } @@ -1311,7 +1311,7 @@ namespace OpenSim.Region.Communications.OGS1 #region Methods triggered by calls from external instances /// - /// + /// /// /// /// @@ -1342,7 +1342,7 @@ namespace OpenSim.Region.Communications.OGS1 nRegionInfo.RegionLocX = regionData.X; nRegionInfo.RegionLocY = regionData.Y; - + try { lock (m_deadRegionCache) @@ -1379,14 +1379,14 @@ namespace OpenSim.Region.Communications.OGS1 } /// - /// + /// /// /// /// /// public bool IncomingPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) { - // Is this necessary? + // Is this necessary? try { m_localBackend.TriggerExpectPrim(regionHandle, primID, objData, XMLMethod); @@ -1401,7 +1401,7 @@ namespace OpenSim.Region.Communications.OGS1 } /// - /// + /// /// /// /// diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 0f75a09..9b3d878 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs @@ -41,11 +41,11 @@ namespace OpenSim.Region.Communications.OGS1 { public class OGS1InventoryService : IInventoryServices { - private static readonly ILog m_log + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private string _inventoryServerUrl; - private Dictionary m_RequestingInventory + private Dictionary m_RequestingInventory = new Dictionary(); public OGS1InventoryService(string inventoryServerUrl) @@ -65,26 +65,26 @@ namespace OpenSim.Region.Communications.OGS1 if (!m_RequestingInventory.ContainsKey(userID)) { m_RequestingInventory.Add(userID, callback); - + try { m_log.InfoFormat( "[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}", _inventoryServerUrl, userID); - + RestObjectPosterResponse requester = new RestObjectPosterResponse(); requester.ResponseCallback = InventoryResponse; - + requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.UUID); } catch (WebException e) { if (StatsManager.SimExtraStats != null) StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure(); - - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", - e.Source, e.Message); + + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", + e.Source, e.Message); } } else @@ -92,11 +92,11 @@ namespace OpenSim.Region.Communications.OGS1 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID); } } - + /// /// Callback used by the inventory server GetInventory request /// - /// + /// private void InventoryResponse(InventoryCollection response) { LLUUID userID = response.UserID; @@ -108,17 +108,17 @@ namespace OpenSim.Region.Communications.OGS1 InventoryFolderImpl rootFolder = null; InventoryReceiptCallback callback = m_RequestingInventory[userID]; - + ICollection folders = new List(); ICollection items = new List(); - + foreach (InventoryFolderBase folder in response.Folders) { if (folder.ParentID == LLUUID.Zero) { rootFolder = new InventoryFolderImpl(folder); folders.Add(rootFolder); - + break; } } @@ -142,9 +142,9 @@ namespace OpenSim.Region.Communications.OGS1 { m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID); } - + callback(folders, items); - + m_RequestingInventory.Remove(userID); } else @@ -158,7 +158,7 @@ namespace OpenSim.Region.Communications.OGS1 /// /// - /// + /// public bool AddFolder(InventoryFolderBase folder) { try @@ -168,68 +168,68 @@ namespace OpenSim.Region.Communications.OGS1 } catch (WebException e) { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}", + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}", e.Source, e.Message); } - + return false; } /// /// /// - /// + /// public bool MoveFolder(InventoryFolderBase folder) { try - { + { return SynchronousRestObjectPoster.BeginPostObject( "POST", _inventoryServerUrl + "/MoveFolder/", folder); } catch (WebException e) { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", e.Source, e.Message); - } - + } + return false; } - + /// /// /// public bool PurgeFolder(InventoryFolderBase folder) { try - { + { return SynchronousRestObjectPoster.BeginPostObject( "POST", _inventoryServerUrl + "/PurgeFolder/", folder); } catch (WebException e) { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", e.Source, e.Message); - } - + } + return false; - } + } /// /// - /// + /// public bool AddItem(InventoryItemBase item) { try - { + { return SynchronousRestObjectPoster.BeginPostObject( "POST", _inventoryServerUrl + "/NewItem/", item); } catch (WebException e) { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}", + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}", e.Source, e.Message); - } - + } + return false; } @@ -246,26 +246,26 @@ namespace OpenSim.Region.Communications.OGS1 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}", e.Source, e.Message); } - + return false; } /// /// - /// + /// public bool DeleteItem(InventoryItemBase item) { try - { + { return SynchronousRestObjectPoster.BeginPostObject( "POST", _inventoryServerUrl + "/DeleteItem/", item); } catch (WebException e) { - m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}", + m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}", e.Source, e.Message); - } - + } + return false; } @@ -283,12 +283,12 @@ namespace OpenSim.Region.Communications.OGS1 { return false; } - + // See IInventoryServices public List GetInventorySkeleton(LLUUID userId) { m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!"); - + return new List(); } diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index e3ee2c1..63fad4a 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs @@ -117,8 +117,8 @@ namespace OpenSim.Region.Communications.OGS1 { List buddylist = new List(); int buddycount = Convert.ToInt32((string)data["avcount"]); - - + + for (int i = 0; i < buddycount; i++) { FriendListItem buddylistitem = new FriendListItem(); @@ -130,8 +130,8 @@ namespace OpenSim.Region.Communications.OGS1 buddylist.Add(buddylistitem); } - - + + return buddylist; } @@ -201,7 +201,7 @@ namespace OpenSim.Region.Communications.OGS1 /// Get a user profile from the user server /// /// - /// null if the request fails + /// null if the request fails public UserProfileData GetUserProfile(string name) { try @@ -222,7 +222,7 @@ namespace OpenSim.Region.Communications.OGS1 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by name from remote user server: {0}", e); } - + return null; } @@ -251,7 +251,7 @@ namespace OpenSim.Region.Communications.OGS1 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by uuid from remote user server: {0}", e); } - + return null; } @@ -264,7 +264,7 @@ namespace OpenSim.Region.Communications.OGS1 /// Retrieve the user information for the given master uuid. /// /// - /// + /// public UserProfileData SetupMasterUser(string firstName, string lastName) { return SetupMasterUser(firstName, lastName, String.Empty); @@ -274,7 +274,7 @@ namespace OpenSim.Region.Communications.OGS1 /// Retrieve the user information for the given master uuid. /// /// - /// + /// public UserProfileData SetupMasterUser(string firstName, string lastName, string password) { UserProfileData profile = GetUserProfile(firstName, lastName); @@ -289,13 +289,13 @@ namespace OpenSim.Region.Communications.OGS1 public UserProfileData SetupMasterUser(LLUUID uuid) { UserProfileData data = GetUserProfile(uuid); - + if (data == null) { throw new Exception( "Could not retrieve profile for master user " + uuid + ". User server did not respond to the request."); } - + return data; } @@ -405,9 +405,9 @@ namespace OpenSim.Region.Communications.OGS1 { m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " + e.Message); - + } - + } /// @@ -422,7 +422,7 @@ namespace OpenSim.Region.Communications.OGS1 Hashtable param = new Hashtable(); param["ownerID"] = friendlistowner.UUID.ToString(); param["friendID"] = friend.UUID.ToString(); - + IList parameters = new ArrayList(); parameters.Add(param); @@ -458,7 +458,7 @@ namespace OpenSim.Region.Communications.OGS1 { m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " + e.Message); - + } } @@ -519,7 +519,7 @@ namespace OpenSim.Region.Communications.OGS1 public List GetUserFriendList(LLUUID friendlistowner) { List buddylist = new List(); - + try { Hashtable param = new Hashtable(); @@ -531,11 +531,11 @@ namespace OpenSim.Region.Communications.OGS1 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000); Hashtable respData = (Hashtable) resp.Value; - if (respData.Contains("avcount")) + if (respData.Contains("avcount")) { buddylist = ConvertXMLRPCDataToFriendListItemList(respData); } - + } catch (WebException e) { @@ -550,7 +550,7 @@ namespace OpenSim.Region.Communications.OGS1 /// Appearance /// TODO: stubs for now to get us to a compiling state gently - public AvatarAppearance GetUserAppearance(LLUUID user) + public AvatarAppearance GetUserAppearance(LLUUID user) { return new AvatarAppearance(); } @@ -564,12 +564,12 @@ namespace OpenSim.Region.Communications.OGS1 { return; } - + public void RemoveAttachment(LLUUID user, LLUUID item) { return; } - + public List GetAttachments(LLUUID user) { return new List(); diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs index 964180a..c15c604 100644 --- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,11 +54,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly : AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 2b18871..e08934b 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs @@ -23,7 +23,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* +* */ using System.Collections; @@ -65,7 +65,7 @@ namespace OpenSim.Region.DataSnapshot reply["str_response_string"] = response.OuterXml; reply["int_response_code"] = statuscode; reply["content_type"] = "text/xml"; - + return reply; } } diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 5831ddc..af3e547 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs @@ -23,7 +23,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* +* */ using System; @@ -70,14 +70,14 @@ namespace OpenSim.Region.DataSnapshot #region IRegionModule public void Close() { - + } - + public void Initialise(Scene scene, IConfigSource config) { if (!m_scenes.Contains(scene)) m_scenes.Add(scene); - + if (!m_configLoaded) { m_configLoaded = true; @@ -317,7 +317,7 @@ namespace OpenSim.Region.DataSnapshot private String GetRegionCategory(Scene scene) { - + //Boolean choice between: // "PG" - Mormontown // "Mature" - Sodom and Gomorrah @@ -396,7 +396,7 @@ namespace OpenSim.Region.DataSnapshot } /** - * Reply to the http request + * Reply to the http request */ public XmlDocument GetSnapshot(string regionName) { diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs index 9f19b43..fb9c51a 100644 --- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs +++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs @@ -23,7 +23,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* +* */ using System.Xml; diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index b60232b..183c2a3 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs @@ -23,7 +23,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* +* */ using System; @@ -51,9 +51,9 @@ namespace OpenSim.Region.DataSnapshot /* * David, I don't think we need this at all. When we do the snapshot, we can - * simply look into the parcels that are marked for ShowDirectory -- see + * simply look into the parcels that are marked for ShowDirectory -- see * conditional in RequestSnapshotData - * + * //Revise this, look for more direct way of checking for change in land #region Client hooks @@ -115,7 +115,7 @@ namespace OpenSim.Region.DataSnapshot } public XmlNode RequestSnapshotData(XmlDocument nodeFactory) - { + { ILandChannel landChannel = (LandChannel)m_scene.LandChannel; Dictionary landList = null; try diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index b2ef6d3..3270c3a 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs @@ -58,7 +58,7 @@ namespace OpenSim.Region.DataSnapshot foreach (EntityBase entity in m_scene.Entities.Values) { // only objects, not avatars - if (entity is SceneObjectGroup) + if (entity is SceneObjectGroup) { SceneObjectGroup obj = (SceneObjectGroup)entity; diff --git a/OpenSim/Region/Environment/InstantMessageReceiver.cs b/OpenSim/Region/Environment/InstantMessageReceiver.cs index b82b4aa..d82bffc 100644 --- a/OpenSim/Region/Environment/InstantMessageReceiver.cs +++ b/OpenSim/Region/Environment/InstantMessageReceiver.cs @@ -32,11 +32,11 @@ namespace OpenSim.Region.Environment /// /// Bit Vector for Which Modules to send an instant message to from the Scene or an Associated Module /// - + // This prevents the Modules from sending Instant messages to other modules through the scene // and then receiving the same messages - // This is mostly here because on LLSL and the SecondLife Client, IMs,Groups and friends are linked + // This is mostly here because on LLSL and the SecondLife Client, IMs,Groups and friends are linked // inseparably [Flags] diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs index 86958d1..d03e167 100644 --- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs +++ b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs @@ -31,7 +31,7 @@ using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Interfaces { - public interface IAvatarFactory + public interface IAvatarFactory { bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance); void UpdateDatabase(LLUUID userID, AvatarAppearance avatAppearance); diff --git a/OpenSim/Region/Environment/Interfaces/IScenePermissions.cs b/OpenSim/Region/Environment/Interfaces/IScenePermissions.cs index f28b46c..eba4a04 100644 --- a/OpenSim/Region/Environment/Interfaces/IScenePermissions.cs +++ b/OpenSim/Region/Environment/Interfaces/IScenePermissions.cs @@ -28,7 +28,7 @@ using libsecondlife; namespace OpenSim.Region.Environment.Interfaces -{ +{ public interface IScenePermissions { } diff --git a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs b/OpenSim/Region/Environment/Interfaces/ITextureSender.cs index 1b9e4eb..ece1953 100644 --- a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs +++ b/OpenSim/Region/Environment/Interfaces/ITextureSender.cs @@ -31,17 +31,17 @@ namespace OpenSim.Region.Environment.Interfaces /// Interface for an object which can send texture information to a client /// public interface ITextureSender - { + { /// /// Are we in the process of sending the texture? /// bool Sending { get; set; } - + /// /// Has the texture send been cancelled? /// bool Cancel { get; set; } - + /// /// Update the non data properties of a texture request /// @@ -53,6 +53,6 @@ namespace OpenSim.Region.Environment.Interfaces /// Send a texture packet to the client. /// /// True if the last packet has been sent, false otherwise. - bool SendTexturePacket(); + bool SendTexturePacket(); } } diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs index 48db51b..d3cf41e 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs @@ -216,7 +216,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload public IClientAPI RequestUser; public LLUUID TransferRequestID; //public bool AssetInCache; - //public int TimeRequested; + //public int TimeRequested; public AssetRequest() { diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs index bae23fa..65785af 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction /// public class AgentAssetTransactions { - //private static readonly log4net.ILog m_log + //private static readonly log4net.ILog m_log // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); // Fields @@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction } ourClient.SendConfirmXfer(xferID, packetID); - + if ((packetID & 0x80000000) != 0) { SendCompleteMessage(); @@ -209,7 +209,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction /// /// /// - /// True if the transfer is complete, false otherwise + /// True if the transfer is complete, false otherwise public bool Initialise(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal, bool tempFile) { @@ -363,7 +363,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction private void DoCreateItem() { - //really need to fix this call, if lbsa71 saw this he would die. + //really need to fix this call, if lbsa71 saw this he would die. m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset); CachedUserInfo userInfo = m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails(ourClient.AgentId); diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs index fcd0e0c..fd407d9 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs @@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction /// /// Create an inventory item from data that has been received through a transaction. - /// + /// /// This is called when new clothing or body parts are created. It may also be called in other /// situations. /// @@ -229,8 +229,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction /// /// Update an inventory item with data that has been received through a transaction. - /// - /// This is called when clothing or body parts are updated (for instance, with new textures or + /// + /// This is called when clothing or body parts are updated (for instance, with new textures or /// colours). It may also be called in other situations. /// /// diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs index 474ac75..8f81f3d 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload { public class TextureDownloadModule : IRegionModule { - //private static readonly log4net.ILog m_log + //private static readonly log4net.ILog m_log // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); /// @@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload private void TextureSent(ITextureSender sender) { sender.Sending = false; - //m_log.DebugFormat("[TEXTURE DOWNLOAD]: Removing download stat for {0}", sender.assetID); + //m_log.DebugFormat("[TEXTURE DOWNLOAD]: Removing download stat for {0}", sender.assetID); m_scene.AddPendingDownloads(-1); } } diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 70e44d4..7c187c0 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs @@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload /// public class TextureNotFoundSender : ITextureSender { - //private static readonly log4net.ILog m_log + //private static readonly log4net.ILog m_log // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private bool m_cancel = false; @@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload public bool SendTexturePacket() { //m_log.InfoFormat( - // "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", + // "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", // m_textureId); ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs index d4fa39f..42624ad 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload { /// /// This module sets up texture senders in response to client texture requests, and places them on a - /// processing queue once those senders have the appropriate data (i.e. a texture retrieved from the + /// processing queue once those senders have the appropriate data (i.e. a texture retrieved from the /// asset cache). /// public class UserTextureDownloadService @@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload /// /// We will allow the client to request the same texture n times before dropping further requests - /// + /// /// This number includes repeated requests for the same texture at different resolutions (which we don't /// currently handle properly as far as I know). However, this situation should be handled in a more /// sophisticated way. @@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload /// We're going to limit requests for the same missing texture. /// XXX This is really a temporary solution to deal with the situation where a client continually requests /// the same missing textures - /// + /// private readonly IRequestLimitStrategy missingTextureLimitStrategy = new RepeatLimitStrategy(MAX_ALLOWED_TEXTURE_REQUESTS); @@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload } /// - /// Handle a texture request. This involves creating a texture sender and placing it on the + /// Handle a texture request. This involves creating a texture sender and placing it on the /// previously passed in shared queue. /// /// @@ -108,7 +108,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload { if (m_textureSenders.TryGetValue(e.RequestedAssetID, out textureSender)) { - // If we've received new non UUID information for this request and it hasn't dispatched + // If we've received new non UUID information for this request and it hasn't dispatched // yet, then update the request accordingly. textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber); } @@ -117,7 +117,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) { // m_log.DebugFormat( -// "[USER TEXTURE DOWNLOAD SERVICE]: Refusing request for {0} from client {1}", +// "[USER TEXTURE DOWNLOAD SERVICE]: Refusing request for {0} from client {1}", // e.RequestedAssetID, m_client.AgentId); return; @@ -128,9 +128,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload { if (StatsManager.SimExtraStats != null) StatsManager.SimExtraStats.AddBlockedMissingTextureRequest(); - - // Commenting out this message for now as it causes too much noise with other - // debug messages. + + // Commenting out this message for now as it causes too much noise with other + // debug messages. // m_log.DebugFormat( // "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs index ea84436..be73156 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs @@ -35,7 +35,7 @@ using OpenSim.Region.Environment.Interfaces; namespace OpenSim.Region.Environment.Modules.Agent.TextureSender { /// - /// A TextureSender handles the process of receiving a texture requested by the client from the + /// A TextureSender handles the process of receiving a texture requested by the client from the /// AssetCache, and then sending that texture back to the client. /// public class TextureSender : ITextureSender @@ -150,14 +150,14 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender { if (NumPackets == 0) { - + RequestUser.SendImagePart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); - + PacketCounter++; } else { - + byte[] ImageData1 = new byte[600]; Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); @@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender } else { - // Doesn't like to be refactored... + // Doesn't like to be refactored... ImagePacketPacket im = new ImagePacketPacket(); im.Header.Reliable = false; im.ImageID.Packet = (ushort)(PacketCounter); diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs index 1b50bbd..16874d7 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs @@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer } /// - /// + /// /// /// /// diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 9e5f376..a72010c 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs @@ -235,7 +235,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat { TrySendChatMessage(presence, fromPos, regionPos, fromAgentID, fromName, e.Type, message, ChatSourceType.Agent); - + } }); } @@ -572,7 +572,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat string regex = @":(?\w*)!(?\S*) PRIVMSG (?\S+) :(?.*)"; Regex RE = new Regex(regex, RegexOptions.Multiline); MatchCollection matches = RE.Matches(input); - // Get some direct matches $1 $4 is a + // Get some direct matches $1 $4 is a if ((matches.Count == 1) && (matches[0].Groups.Count == 5)) { result = new Dictionary(); @@ -703,7 +703,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat public void ProcessIRCCommand(string command) { - //m_log.Info("[IRC]: ProcessIRCCommand:" + command); + //m_log.Info("[IRC]: ProcessIRCCommand:" + command); string[] commArgs = new string[command.Split(' ').Length]; string c_server = m_server; diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index c63fc93..fab546b 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs @@ -46,10 +46,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney /// Demo Economy/Money Module. This is not a production quality money/economy module! /// This is a demo for you to use when making one that works for you. /// // To use the following you need to add: - /// -helperuri
+ /// -helperuri
/// to the command line parameters you use to start up your client /// This commonly looks like -helperuri http://127.0.0.1:9000/ - /// + /// /// Centralized grid structure example using OpenSimWi Redux revision 9+ /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux /// @@ -147,7 +147,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney XMLRPCHandler = scene; // To use the following you need to add: - // -helperuri
+ // -helperuri
// to the command line parameters you use to start up your client // This commonly looks like -helperuri http://127.0.0.1:9000/ @@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney private void OnNewClient(IClientAPI client) { // Here we check if we're in grid mode - // I imagine that the 'check balance' + // I imagine that the 'check balance' // function for the client should be here or shortly after if (gridmode) @@ -367,7 +367,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney { lock (m_KnownClientFunds) { - // If we don't know about the sender, then the sender can't + // If we don't know about the sender, then the sender can't // actually be here and therefore this is likely fraud or outdated. if (m_MoneyAddress.Length == 0) { @@ -1394,7 +1394,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney m_rootAgents[avatar.UUID] = avatar.Scene.RegionInfo.originRegionID; - + //m_log.Info("[MONEY]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); // Claim User! my user! Mine mine mine! diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs index 8c96392..c82f88d 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs @@ -97,9 +97,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends private void OnNewClient(IClientAPI client) { // All friends establishment protocol goes over instant message - // There's no way to send a message from the sim + // There's no way to send a message from the sim // to a user to 'add a friend' without causing dialog box spam - // + // // The base set of friends are added when the user signs on in their XMLRPC response // Generated by LoginService. The friends are retreived from the database by the UserManager @@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends LLUUID[] Agents = new LLUUID[1]; Agents[0] = client.AgentId; av.ControllingClient.SendAgentOnline(Agents); - + } } } @@ -223,14 +223,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends } catch (IndexOutOfRangeException) { - // Ignore the index out of range exception. + // Ignore the index out of range exception. // This causes friend lists to get out of sync slightly.. however // prevents a sim crash. m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); } catch (ArgumentOutOfRangeException) { - // Ignore the index out of range exception. + // Ignore the index out of range exception. // This causes friend lists to get out of sync slightly.. however // prevents a sim crash. m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); @@ -248,14 +248,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends catch (IndexOutOfRangeException) { - // Ignore the index out of range exception. + // Ignore the index out of range exception. // This causes friend lists to get out of sync slightly.. however // prevents a sim crash. m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); } catch (ArgumentOutOfRangeException) { - // Ignore the index out of range exception. + // Ignore the index out of range exception. // This causes friend lists to get out of sync slightly.. however // prevents a sim crash. m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); @@ -411,10 +411,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends { if (m_pendingFriendRequests.ContainsKey(transactionID)) { - // Found Pending Friend Request with that Transaction.. + // Found Pending Friend Request with that Transaction.. Scene SceneAgentIn = m_scene[0]; - // Found Pending Friend Request with that Transaction.. + // Found Pending Friend Request with that Transaction.. ScenePresence agentpresence = GetPresenceFromAgentID(agentID); if (agentpresence != null) { @@ -453,7 +453,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends { Scene SceneAgentIn = m_scene[0]; - // Found Pending Friend Request with that Transaction.. + // Found Pending Friend Request with that Transaction.. ScenePresence agentpresence = GetPresenceFromAgentID(agentID); if (agentpresence != null) { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs index 624f307..e1cc688 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs @@ -107,7 +107,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory // First byte of the array is probably the item type // Next 16 bytes are the UUID - //Array.Copy(binaryBucket, 1, rawId, 0, 16); + //Array.Copy(binaryBucket, 1, rawId, 0, 16); //LLUUID itemId = new LLUUID(new Guid(rawId)); LLUUID itemId = new LLUUID(binaryBucket, 1); diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs index 15825b6..2e2be7a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs @@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles } /// - /// + /// /// /// /// diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index 2112f91..f8651a3 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs @@ -226,7 +226,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice public string ProvisionVoiceAccountRequest(string request, string path, string param, LLUUID agentID, Caps caps) { - // we need to + // we need to // - get user data from UserProfileCacheService // - generate nonce for user voice account password // - issue XmlRpc request to asterisk opensim front end: diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs index e1339a3..87ecfee 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs @@ -40,25 +40,25 @@ using OpenSim.Region.Environment.Scenes; /***************************************************** * * ScriptsHttpRequests - * + * * Implements the llHttpRequest and http_response * callback. - * + * * Some stuff was already in LSLLongCmdHandler, and then * there was this file with a stub class in it. So, * I am moving some of the objects and functions out of * LSLLongCmdHandler, such as the HttpRequestClass, the - * start and stop methods, and setting up pending and - * completed queues. These are processed in the - * LSLLongCmdHandler polling loop. Similiar to the + * start and stop methods, and setting up pending and + * completed queues. These are processed in the + * LSLLongCmdHandler polling loop. Similiar to the * XMLRPCModule, since that seems to work. - * + * * //TODO - * + * * This probably needs some throttling mechanism but * its wide open right now. This applies to both * number of requests and data volume. - * + * * Linden puts all kinds of header fields in the requests. * Not doing any of that: * User-Agent @@ -71,13 +71,13 @@ using OpenSim.Region.Environment.Scenes; * X-SecondLife-Local-Rotation * X-SecondLife-Owner-Name * X-SecondLife-Owner-Key - * + * * HTTPS support - * + * * Configurable timeout? * Configurable max repsonse size? * Configurable - * + * * **************************************************/ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest diff --git a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs index 626c60f..bbd4fa3 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs @@ -226,7 +226,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.VectorRender foreach (string line in lines) { string nextLine = line.Trim(); - //replace with switch, or even better, do some proper parsing + //replace with switch, or even better, do some proper parsing if (nextLine.StartsWith("MoveTo")) { float x = 0; diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs index 7a15708..4ed0fb5 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs @@ -37,25 +37,25 @@ using OpenSim.Region.Environment.Scenes; /***************************************************** * * WorldCommModule - * - * + * + * * Holding place for world comms - basically llListen * function implementation. - * + * * lLListen(integer channel, string name, key id, string msg) - * The name, id, and msg arguments specify the filtering - * criteria. You can pass the empty string - * (or NULL_KEY for id) for these to set a completely - * open filter; this causes the listen() event handler to be - * invoked for all chat on the channel. To listen only - * for chat spoken by a specific object or avatar, - * specify the name and/or id arguments. To listen - * only for a specific command, specify the - * (case-sensitive) msg argument. If msg is not empty, - * listener will only hear strings which are exactly equal + * The name, id, and msg arguments specify the filtering + * criteria. You can pass the empty string + * (or NULL_KEY for id) for these to set a completely + * open filter; this causes the listen() event handler to be + * invoked for all chat on the channel. To listen only + * for chat spoken by a specific object or avatar, + * specify the name and/or id arguments. To listen + * only for a specific command, specify the + * (case-sensitive) msg argument. If msg is not empty, + * listener will only hear strings which are exactly equal * to msg. You can also use all the arguments to establish * the most restrictive filtering criteria. - * + * * It might be useful for each listener to maintain a message * digest, with a list of recent messages by UUID. This can * be used to prevent in-world repeater loops. However, the @@ -76,7 +76,7 @@ using OpenSim.Region.Environment.Scenes; * Might be actually easier to map the global handle into * script-local handle in the ScriptEngine. Not sure if its * worth the effort tho. - * + * * **************************************************/ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm @@ -317,9 +317,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm } /******************************************************************** - * + * * Listener Stuff - * + * * *****************************************************************/ private void DeliverClientMessage(Object sender, ChatFromViewerArgs e) diff --git a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs index a039d42..9d4e0fa 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs @@ -43,12 +43,12 @@ using OpenSim.Region.Environment.Scenes; /***************************************************** * * XMLRPCModule - * + * * Module for accepting incoming communications from * external XMLRPC client and calling a remote data * procedure for a registered data channel/prim. - * - * + * + * * 1. On module load, open a listener port * 2. Attach an XMLRPC handler * 3. When a request is received: @@ -59,18 +59,18 @@ using OpenSim.Region.Environment.Scenes; * 3.5 Return response to client caller * 3.6 If no response from llRemoteDataReply within * RemoteReplyScriptTimeout, generate script timeout fault - * + * * Prims in script must: * 1. Open a remote data channel * 1.1 Generate a channel ID * 1.2 Register primid,channelid pair with module * 2. Implement the remote data procedure handler - * + * * llOpenRemoteDataChannel * llRemoteDataReply * remote_data(integer type, key channel, key messageid, string sender, integer ival, string sval) * llCloseRemoteDataChannel - * + * * **************************************************/ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC @@ -157,16 +157,16 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC /********************************************** * OpenXMLRPCChannel - * + * * Generate a LLUUID channel key and add it and * the prim id to dictionary - * + * * First check if there is a channel assigned for * this itemID. If there is, then someone called * llOpenRemoteDataChannel twice. Just return the * original channel. Other option is to delete the * current channel and assign a new one. - * + * * ********************************************/ public LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID) @@ -224,9 +224,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC /********************************************** * Remote Data Reply - * + * * Response to RPC message - * + * *********************************************/ public void RemoteDataReply(string channel, string message_id, string sdata, int idata) @@ -245,9 +245,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC /********************************************** * CloseXMLRPCChannel - * + * * Remove channel from dictionary - * + * *********************************************/ public void CloseXMLRPCChannel(LLUUID channelKey) diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs index b5d5e6e..82341a9 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land #region Constants //Land types set with flags in ParcelOverlay. - //Only one of these can be used. + //Only one of these can be used. public const float BAN_LINE_SAFETY_HIEGHT = 100; public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = 128; //Equals 10000000 public const byte LAND_FLAG_PROPERTY_BORDER_WEST = 64; //Equals 01000000 @@ -584,7 +584,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) { remote_client.sendLandParcelOverlay(byteArray, sequenceID); - byteArrayCount = 0; + byteArrayCount = 0; sequenceID++; byteArray = new byte[LAND_BLOCKS_PER_PACKET]; } @@ -655,7 +655,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client) { - + landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client); } @@ -870,7 +870,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land } public void handleAnyClientMovement(ScenePresence avatar) - //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. + //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. { ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); if (over != null) diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index b319370..54870d8 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs @@ -622,7 +622,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land /// /// Notify the parcel owner each avatar that owns prims situated on their land. This notification includes /// aggreagete details such as the number of prims. - /// + /// /// /// /// A diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index d31a250..43e8f36 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions #region Constants // These are here for testing. They will be taken out - + //private uint PERM_ALL = (uint)2147483647; private uint PERM_COPY = (uint)32768; //private uint PERM_MODIFY = (uint)16384; @@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions #region Bypass Permissions / Debug Permissions Stuff - // Bypasses the permissions engine + // Bypasses the permissions engine private bool m_bypassPermissions = false; private bool m_bypassPermissionsValue = true; private bool m_debugPermissions = false; @@ -126,18 +126,18 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions public void Initialise(Scene scene, IConfigSource config) { m_scene = scene; - + IConfig myConfig = config.Configs["Startup"]; - - string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule"); - List modules=new List(permissionModules.Split(',')); + string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule"); + + List modules=new List(permissionModules.Split(',')); - if(!modules.Contains("DefaultPermissionsModule")) - return; + if (!modules.Contains("DefaultPermissionsModule")) + return; + + m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); - m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); - m_scene.RegisterModuleInterface(this); //Register functions with Scene External Checks! @@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions get { return false; } } - #endregion + #endregion #region Helper Functions protected void SendPermissionError(LLUUID user, string reason) @@ -252,38 +252,38 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions } #endregion - public bool PropagatePermissions() - { - return false; - } + public bool PropagatePermissions() + { + return false; + } - public bool BypassPermissions() - { - return m_bypassPermissions; - } + public bool BypassPermissions() + { + return m_bypassPermissions; + } - public void SetBypassPermissions(bool value) - { - m_bypassPermissions=value; - } + public void SetBypassPermissions(bool value) + { + m_bypassPermissions=value; + } #region Object Permissions public uint GenerateClientFlags(LLUUID user, LLUUID objID) { - // Here's the way this works, + // Here's the way this works, // ObjectFlags and Permission flags are two different enumerations // ObjectFlags, however, tells the client to change what it will allow the user to do. - // So, that means that all of the permissions type ObjectFlags are /temporary/ and only - // supposed to be set when customizing the objectflags for the client. + // So, that means that all of the permissions type ObjectFlags are /temporary/ and only + // supposed to be set when customizing the objectflags for the client. - // These temporary objectflags get computed and added in this function based on the + // These temporary objectflags get computed and added in this function based on the // Permission mask that's appropriate! // Outside of this method, they should never be added to objectflags! // -teravus SceneObjectPart task=m_scene.GetSceneObjectPart(objID); - + // this shouldn't ever happen.. return no permissions/objectflags. if (task == null) return (uint)0; @@ -292,7 +292,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions LLUUID objectOwner = task.OwnerID; - // Remove any of the objectFlags that are temporary. These will get added back if appropriate + // Remove any of the objectFlags that are temporary. These will get added back if appropriate // in the next bit of code objflags &= (uint) @@ -354,7 +354,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions private uint ApplyObjectModifyMasks(uint setPermissionMask, uint objectFlagsMask) { - // We are adding the temporary objectflags to the object's objectflags based on the + // We are adding the temporary objectflags to the object's objectflags based on the // permission flag given. These change the F flags on the client. if ((setPermissionMask & (uint)PermissionMask.Copy) != 0) @@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0); // People shouldn't be able to do anything with locked objects, except the Administrator - // The 'set permissions' runs through a different permission check, so when an object owner + // The 'set permissions' runs through a different permission check, so when an object owner // sets an object locked, the only thing that they can do is unlock it. // // Nobody but the object owner can set permissions on an object @@ -458,7 +458,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions bool permission = false; string reason = "Only registered users may communicate with another account."; - + if (IsAdministrator(user)) permission = true; @@ -521,7 +521,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions return GenericParcelPermission(user, parcel); } #endregion - + #region Permission Checks private bool CanAbandonParcel(LLUUID user, ILandObject parcel, Scene scene) { @@ -607,7 +607,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - + return GenericCommunicationPermission(user, target); } @@ -632,8 +632,8 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions return false; } - // The client - // may request to edit linked parts, and therefore, it needs + // The client + // may request to edit linked parts, and therefore, it needs // to also check for SceneObjectPart // If it's not an object, we cant edit it. @@ -647,7 +647,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions LLUUID taskOwner = null; - // Added this because at this point in time it wouldn't be wise for + // Added this because at this point in time it wouldn't be wise for // the administrator object permissions to take effect. LLUUID objectOwner = task.OwnerID; @@ -682,12 +682,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions // This is an exception to the generic object permission. - // Administrators who lock their objects should not be able to move them, + // Administrators who lock their objects should not be able to move them, // however generic object permission should return true. // This keeps locked objects from being affected by random click + drag actions by accident // and allows the administrator to grab or delete a locked object. - // Administrators and estate managers are still able to click+grab locked objects not + // Administrators and estate managers are still able to click+grab locked objects not // owned by them in the scene // This is by design. @@ -834,7 +834,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; LLUUID taskOwner = null; - // Added this because at this point in time it wouldn't be wise for + // Added this because at this point in time it wouldn't be wise for // the administrator object permissions to take effect. LLUUID objectOwner = task.OwnerID; @@ -895,61 +895,61 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions #endregion - public bool CanLinkObject(LLUUID userID, LLUUID objectID) - { + public bool CanLinkObject(LLUUID userID, LLUUID objectID) + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } - public bool CanDelinkObject(LLUUID userID, LLUUID objectID) - { + public bool CanDelinkObject(LLUUID userID, LLUUID objectID) + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } - public bool CanBuyLand(LLUUID userID, ILandObject parcel, Scene scene) - { + public bool CanBuyLand(LLUUID userID, ILandObject parcel, Scene scene) + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } - public bool CanCopyInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) - { + public bool CanCopyInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } - public bool CanDeleteInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) - { + public bool CanDeleteInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } - public bool CanCreateInventory(uint invType, LLUUID objectID, LLUUID userID) - { + public bool CanCreateInventory(uint invType, LLUUID objectID, LLUUID userID) + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } - public bool CanTeleport(LLUUID userID) - { + public bool CanTeleport(LLUUID userID) + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } } diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs index beb74ce..1bdc702 100644 --- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs @@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules // Current time in elpased seconds since Jan 1st 1970 private ulong CurrentTime { - get { + get { return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset)/10000000); } } @@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment.Modules TimeZone local = TimeZone.CurrentTimeZone; TicksOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks; - + m_log.Debug("[SUN] localtime offset is " + TicksOffset); // Align ticks with Second Life @@ -246,7 +246,7 @@ namespace OpenSim.Region.Environment.Modules avatar.ControllingClient.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition); } - // set estate settings for region access to sun position + // set estate settings for region access to sun position m_scene.RegionInfo.EstateSettings.sunPosition = Position; } @@ -281,7 +281,7 @@ namespace OpenSim.Region.Environment.Modules Position = LLVector3.Rot(Position,Tilt); - // Finally we shift the axis so that more of the + // Finally we shift the axis so that more of the // circle is above the horizon than below. This // makes the nights shorter than the days. diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs index eb981d9..98d69a5 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs @@ -31,9 +31,9 @@ using OpenSim.Region.Environment.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { /// - /// A generic windows bitmap loader. + /// A generic windows bitmap loader. /// Should be capable of handling 24-bit RGB images. - /// + /// /// Uses the System.Drawing filesystem loader. /// internal class BMP : GenericSystemDrawing diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs index 484bb89..bb819e1 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs @@ -33,7 +33,7 @@ using OpenSim.Region.Environment.Interfaces; namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders { /// - /// A virtual class designed to have methods overloaded, + /// A virtual class designed to have methods overloaded, /// this class provides an interface for a generic image /// saving and loading mechanism, but does not specify the /// format. It should not be insubstantiated directly. @@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders } /// - /// Protected method, generates a grayscale bitmap + /// Protected method, generates a grayscale bitmap /// image from a specified terrain channel. /// /// The terrain channel to export to bitmap @@ -134,7 +134,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders } /// - /// Protected method, generates a coloured bitmap + /// Protected method, generates a coloured bitmap /// image from a specified terrain channel. /// /// The terrain channel to export to bitmap diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs index 0c4e3de..7bf88f0 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs @@ -43,14 +43,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes double sum = 0.0; double step2 = 0.0; - // compute delta map + // compute delta map for (x = 0; x < map.Width; x++) { for (y = 0; y < map.Height; y++) { double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); - if (z > 0) // add in non-zero amount + if (z > 0) // add in non-zero amount { sum += map[x, y] * z; step2 += z; @@ -60,14 +60,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes double avg = sum / step2; - // blend in map + // blend in map for (x = 0; x < map.Width; x++) { for (y = 0; y < map.Height; y++) { double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * duration; - if (z > 0) // add in non-zero amount + if (z > 0) // add in non-zero amount { if (z > 1.0) z = 1.0; diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs index f2a1800..6df8408 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs @@ -32,8 +32,8 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { /// /// Speed-Optimised Hybrid Erosion Brush - /// - /// As per Jacob Olsen's Paper + /// + /// As per Jacob Olsen's Paper /// http://www.oddlabs.com/download/terrain_generation.pdf /// public class OlsenSphere : ITerrainPaintableEffect @@ -164,7 +164,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); - if (z > 0) // add in non-zero amount + if (z > 0) // add in non-zero amount { const int NEIGHBOUR_ME = 4; const int NEIGHBOUR_MAX = 9; diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs index 49946fd..fc0a579 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs @@ -43,14 +43,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes double area = strength; double step = strength / 4.0; - // compute delta map + // compute delta map for (x = 0; x < map.Width; x++) { for (y = 0; y < map.Height; y++) { double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); - if (z > 0) // add in non-zero amount + if (z > 0) // add in non-zero amount { double average = 0.0; int avgsteps = 0; @@ -69,14 +69,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes } } } - // blend in map + // blend in map for (x = 0; x < map.Width; x++) { for (y = 0; y < map.Height; y++) { double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); - if (z > 0) // add in non-zero amount + if (z > 0) // add in non-zero amount { double da = z; double a = (map[x, y] - tweak[x, y]) * da; diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs index 753d171..b3aa732 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs @@ -160,7 +160,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes { double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); - if (z > 0) // add in non-zero amount + if (z > 0) // add in non-zero amount { const int NEIGHBOUR_ME = 4; const int NEIGHBOUR_MAX = 9; diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs index 18a2851..4b6ca49 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs @@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Scenes { [Serializable] public abstract class EntityBase : ISerializable - { + { /// /// The scene to which this entity belongs /// @@ -56,7 +56,7 @@ namespace OpenSim.Region.Environment.Scenes protected string m_name; /// - /// + /// /// public virtual string Name { @@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Scenes protected LLVector3 m_pos; /// - /// + /// /// public virtual LLVector3 AbsolutePosition { @@ -79,7 +79,7 @@ namespace OpenSim.Region.Environment.Scenes protected LLVector3 m_rotationalvelocity; /// - /// + /// /// public virtual LLVector3 Velocity { @@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public abstract void UpdateMovement(); diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index aa22740..352fdf9 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Scenes set { // If we're not doing the initial set - // Then we've got to remove the previous + // Then we've got to remove the previous // event handler try { @@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes // This occurs when storing to _PhyScene the first time. // Is there a better way to check the event handler before // getting here - // This can be safely ignored. We're setting the first inital + // This can be safely ignored. We're setting the first inital // there are no event handler's registered. } @@ -120,7 +120,7 @@ namespace OpenSim.Region.Environment.Scenes { ScenePresences.Clear(); } - + //SceneObjects.Clear(); Entities.Clear(); } @@ -235,7 +235,7 @@ namespace OpenSim.Region.Environment.Scenes for (int i = 0; i < m_updateList.Count; i++) { EntityBase entity = m_updateList[i]; - + // Don't abort the whole update if one entity happens to give us an exception. try { @@ -327,7 +327,7 @@ namespace OpenSim.Region.Environment.Scenes part.Undo(); } - + } @@ -341,7 +341,7 @@ namespace OpenSim.Region.Environment.Scenes public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot) { // Calls attach with a Zero position - + AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, LLVector3.Zero); } public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask) @@ -364,8 +364,8 @@ namespace OpenSim.Region.Environment.Scenes // To LocalId or LLUUID, *THAT* is the question. How now Brown LLUUID?? public void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient) { - - if (itemID == LLUUID.Zero) // If this happened, someone made a mistake.... + + if (itemID == LLUUID.Zero) // If this happened, someone made a mistake.... return; List EntityList = GetEntities(); @@ -443,14 +443,14 @@ namespace OpenSim.Region.Environment.Scenes { remoteClient.SendAgentAlertMessage("You don't have sufficient permissions to attach this object", false); } - + } } } } - + public ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child, AvatarAppearance appearance) { ScenePresence newAvatar = null; @@ -627,13 +627,13 @@ namespace OpenSim.Region.Environment.Scenes return result; } - + /// /// Get the controlling client for the given avatar, if there is one. - /// - /// FIXME: The only user of the method right now is Caps.cs, in order to resolve a client API since it can't + /// + /// FIXME: The only user of the method right now is Caps.cs, in order to resolve a client API since it can't /// use the ScenePresence. This could be better solved in a number of ways - we could establish an - /// OpenSim.Framework.IScenePresence, or move the caps code into a region package (which might be the more + /// OpenSim.Framework.IScenePresence, or move the caps code into a region package (which might be the more /// suitable solution). /// /// @@ -641,12 +641,12 @@ namespace OpenSim.Region.Environment.Scenes public IClientAPI GetControllingClient(LLUUID agentId) { ScenePresence presence = GetScenePresence(agentId); - + if (presence != null) { return presence.ControllingClient; } - + return null; } @@ -657,7 +657,7 @@ namespace OpenSim.Region.Environment.Scenes public List GetScenePresences(FilterAvatarList filter) { // No locking of scene presences here since we're passing back a list... - + List result = new List(); List ScenePresencesList = GetScenePresences(); @@ -681,7 +681,7 @@ namespace OpenSim.Region.Environment.Scenes { ScenePresence sp; ScenePresences.TryGetValue(agentID, out sp); - + return sp; } @@ -764,13 +764,13 @@ namespace OpenSim.Region.Environment.Scenes { if (!presence.IsChildAgent) { - avatar = presence; + avatar = presence; return true; } else { m_log.WarnFormat( - "[INNER SCENE]: Requested avatar {0} could not be found in scene {1} since it is only registered as a child agent!", + "[INNER SCENE]: Requested avatar {0} could not be found in scene {1} since it is only registered as a child agent!", avatarId, m_parentScene.RegionInfo.RegionName); } } @@ -846,8 +846,8 @@ namespace OpenSim.Region.Environment.Scenes { // Only send child agents stuff in their draw distance. // This will need to be done for every agent once we figure out - // what we're going to use to store prim that agents already got - // the initial update for and what we'll use to limit the + // what we're going to use to store prim that agents already got + // the initial update for and what we'll use to limit the // space we check for new objects on movement. if (presence.IsChildAgent && m_parentScene.m_seeIntoRegionFromNeighbor) @@ -889,7 +889,7 @@ namespace OpenSim.Region.Environment.Scenes #region Client Event handlers /// - /// + /// /// /// /// @@ -918,7 +918,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// This handles the nifty little tool tip that you get when you drag your mouse over an object + /// This handles the nifty little tool tip that you get when you drag your mouse over an object /// Send to the Object Group to process. We don't know enough to service the request /// /// @@ -936,7 +936,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -954,7 +954,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -972,7 +972,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1009,7 +1009,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1019,13 +1019,13 @@ namespace OpenSim.Region.Environment.Scenes SceneObjectGroup group = GetGroupByPrim(localID); if (group != null) { - + LLVector3 oldPos = group.AbsolutePosition; if (group.RootPart.m_IsAttachment) { group.UpdateGroupPosition(pos); } - else + else { if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment) { @@ -1041,7 +1041,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1059,7 +1059,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1094,7 +1094,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1111,7 +1111,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1141,7 +1141,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1223,7 +1223,7 @@ namespace OpenSim.Region.Environment.Scenes { parenPrim.LinkToGroup(sceneObj); } - + // We need to explicitly resend the newly link prim's object properties since no other actions // occur on link to invoke this elsewhere (such as object selection) parenPrim.GetProperties(client); @@ -1232,7 +1232,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// Delink a linkset /// - /// + /// public void DelinkObjects(List primIds) { SceneObjectGroup parenPrim = null; @@ -1278,7 +1278,7 @@ namespace OpenSim.Region.Environment.Scenes else { // If the first scan failed, we need to do a /deep/ scan of the linkages. This is /really/ slow - // We know that this is not the root prim now essentially, so we don't have to worry about remapping + // We know that this is not the root prim now essentially, so we don't have to worry about remapping // which one is the root prim bool delinkedSomething = false; for (int i = 0; i < primIds.Count; i++) @@ -1324,7 +1324,7 @@ namespace OpenSim.Region.Environment.Scenes } } } - + //Protip: In my day, we didn't call them searchable objects, we called them limited point-to-point joints //aka ObjectFlags.JointWheel = IncludeInSearch @@ -1356,7 +1356,7 @@ namespace OpenSim.Region.Environment.Scenes public void DuplicateObject(uint originalPrim, LLVector3 offset, uint flags, LLUUID AgentID, LLUUID GroupID) { m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); - + List EntityList = GetEntities(); SceneObjectGroup originPrim = null; @@ -1405,7 +1405,7 @@ namespace OpenSim.Region.Environment.Scenes /// public float Vector3Distance(Vector3 v1, Vector3 v2) { - // We don't really need the double floating point precision... + // We don't really need the double floating point precision... // so casting it to a single return diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 6aef45e..5e2ccec 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Scenes { public partial class Scene { - private static readonly ILog m_log + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// @@ -49,14 +49,14 @@ namespace OpenSim.Region.Environment.Scenes public void StartScripts() { m_log.Info("[PRIM INVENTORY]: Starting scripts in scene"); - + foreach (EntityBase group in Entities.Values) { if (group is SceneObjectGroup) { ((SceneObjectGroup) group).StartScripts(); } - } + } } /// @@ -67,9 +67,9 @@ namespace OpenSim.Region.Environment.Scenes /// in which the item is to be placed. public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) { - CachedUserInfo userInfo + CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - + if (userInfo != null) { userInfo.AddItem(item); @@ -91,17 +91,17 @@ namespace OpenSim.Region.Environment.Scenes m_log.ErrorFormat( "[AGENT INVENTORY]: Agent {0} {1} was not found for add of item {2} {3}", remoteClient.Name, remoteClient.AgentId, item.Name, item.ID); - + return; - } + } } - /// + /// /// AddInventoryItem(LLUUID, InventoryItemBase) /// /// The ID of the avatar /// The item. This structure contains all the item metadata, including the folder - /// in which the item is to be placed. + /// in which the item is to be placed. public void AddInventoryItem(LLUUID avatarId, InventoryItemBase item) { ScenePresence avatar; @@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Scenes if (userInfo.RootFolder != null) { InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - + if (item != null) { AssetBase asset = @@ -188,13 +188,13 @@ namespace OpenSim.Region.Environment.Scenes /// /// The prim which contains the item to update /// Indicates whether the script to update is currently running - /// + /// public void CapsUpdateTaskInventoryScriptAsset(IClientAPI remoteClient, LLUUID itemId, LLUUID primId, bool isScriptRunning, byte[] data) { // Retrieve group SceneObjectPart part = GetSceneObjectPart(primId); - SceneObjectGroup group = part.ParentGroup; + SceneObjectGroup group = part.ParentGroup; if (null == group) { m_log.ErrorFormat( @@ -204,36 +204,36 @@ namespace OpenSim.Region.Environment.Scenes return; } - + // Retrieve item TaskInventoryItem item = group.GetInventoryItem(part.LocalId, itemId); if (null == item) { return; } - + // Create new asset - // XXX Hardcoding the numbers is a temporary measure - need an enumeration for this + // XXX Hardcoding the numbers is a temporary measure - need an enumeration for this // There may well be one in libsecondlife AssetBase asset = CreateAsset(item.Name, item.Description, 10, 10, data); AssetCache.AddAsset(asset); - + // Update item with new asset item.AssetID = asset.FullID; group.UpdateInventoryItem(item); group.GetProperties(remoteClient); - - // Trigger rerunning of script (use TriggerRezScript event, see RezScript) + + // Trigger rerunning of script (use TriggerRezScript event, see RezScript) if (isScriptRunning) { group.StopScript(part.LocalId, item.ItemID); - group.StartScript(part.LocalId, item.ItemID); + group.StartScript(part.LocalId, item.ItemID); } } /// /// CapsUpdateTaskInventoryScriptAsset(IClientAPI, LLUUID, LLUUID, bool, byte[]) - /// + /// private void CapsUpdateTaskInventoryScriptAsset(LLUUID avatarId, LLUUID itemId, LLUUID primId, bool isScriptRunning, byte[] data) { @@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Scenes if (userInfo != null && userInfo.RootFolder != null) { InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - + if (item != null) { if (LLUUID.Zero == transactionID) @@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment.Scenes item.Name = itemUpd.Name; item.Description = itemUpd.Description; item.NextPermissions = itemUpd.NextPermissions; - item.CurrentPermissions |= 8; // Slam! + item.CurrentPermissions |= 8; // Slam! item.EveryOnePermissions = itemUpd.EveryOnePermissions; // TODO: Requires sanity checks @@ -323,7 +323,7 @@ namespace OpenSim.Region.Environment.Scenes "[AGENT INVENTORY]: Agent ID " + remoteClient.AgentId + " not found for an inventory item update."); } } - + /// /// Give an inventory item from one avatar to another /// @@ -333,35 +333,35 @@ namespace OpenSim.Region.Environment.Scenes public void GiveInventoryItem(IClientAPI recipientClient, LLUUID senderId, LLUUID itemId) { // Retrieve the item from the sender - CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId); - + CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId); + if (senderUserInfo == null) { m_log.ErrorFormat( "[AGENT INVENTORY]: Failed to find sending user {0} for item {1}", senderId, itemId); - + return; } if (senderUserInfo.RootFolder != null) { InventoryItemBase item = senderUserInfo.RootFolder.FindItem(itemId); - + if (item != null) { - if (!ExternalChecks.ExternalChecksBypassPermissions()) - { - if((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0) - return; - } + if (!ExternalChecks.ExternalChecksBypassPermissions()) + { + if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0) + return; + } // TODO get recipient's root folder - CachedUserInfo recipientUserInfo - = CommsManager.UserProfileCacheService.GetUserDetails(recipientClient.AgentId); - + CachedUserInfo recipientUserInfo + = CommsManager.UserProfileCacheService.GetUserDetails(recipientClient.AgentId); + if (recipientUserInfo != null) { - // Insert a copy of the item into the recipient + // Insert a copy of the item into the recipient InventoryItemBase itemCopy = new InventoryItemBase(); itemCopy.Owner = recipientClient.AgentId; itemCopy.Creator = senderId; @@ -372,37 +372,37 @@ namespace OpenSim.Region.Environment.Scenes itemCopy.AssetType = item.AssetType; itemCopy.InvType = item.InvType; itemCopy.Folder = recipientUserInfo.RootFolder.ID; - if (ExternalChecks.ExternalChecksPropagatePermissions()) - { - if(item.InvType == 6) - { - itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); - itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13; - } - else - { - Console.WriteLine("Non-Prim item ==>"); - itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions; - } - - itemCopy.CurrentPermissions = itemCopy.BasePermissions; - if((item.CurrentPermissions & 8) != 0) // Propagate slam bit - { - itemCopy.CurrentPermissions = item.NextPermissions; - itemCopy.BasePermissions=itemCopy.CurrentPermissions; - itemCopy.CurrentPermissions |= 8; - } - - itemCopy.NextPermissions = item.NextPermissions; - itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions; - } - else - { - itemCopy.CurrentPermissions = item.CurrentPermissions; - itemCopy.NextPermissions = item.NextPermissions; - itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions; - itemCopy.BasePermissions = item.BasePermissions; - } + if (ExternalChecks.ExternalChecksPropagatePermissions()) + { + if (item.InvType == 6) + { + itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); + itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13; + } + else + { + Console.WriteLine("Non-Prim item ==>"); + itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions; + } + + itemCopy.CurrentPermissions = itemCopy.BasePermissions; + if ((item.CurrentPermissions & 8) != 0) // Propagate slam bit + { + itemCopy.CurrentPermissions = item.NextPermissions; + itemCopy.BasePermissions=itemCopy.CurrentPermissions; + itemCopy.CurrentPermissions |= 8; + } + + itemCopy.NextPermissions = item.NextPermissions; + itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions; + } + else + { + itemCopy.CurrentPermissions = item.CurrentPermissions; + itemCopy.NextPermissions = item.NextPermissions; + itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions; + itemCopy.BasePermissions = item.BasePermissions; + } itemCopy.GroupID = item.GroupID; itemCopy.GroupOwned = item.GroupOwned; itemCopy.Flags = item.Flags; @@ -410,21 +410,21 @@ namespace OpenSim.Region.Environment.Scenes itemCopy.SaleType = item.SaleType; recipientUserInfo.AddItem(itemCopy); - - if (!ExternalChecks.ExternalChecksBypassPermissions()) - { - if((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) - senderUserInfo.DeleteItem(itemId); - } + + if (!ExternalChecks.ExternalChecksBypassPermissions()) + { + if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) + senderUserInfo.DeleteItem(itemId); + } // Let the recipient client know about this new item - recipientClient.SendBulkUpdateInventory(itemCopy); + recipientClient.SendBulkUpdateInventory(itemCopy); } else { m_log.ErrorFormat( - "[AGENT INVENTORY]: Could not find userinfo for recipient user {0}, {1} of item {2}, {3} from {4}", - recipientClient.Name, recipientClient.AgentId, item.Name, + "[AGENT INVENTORY]: Could not find userinfo for recipient user {0}, {1} of item {2}, {3} from {4}", + recipientClient.Name, recipientClient.AgentId, item.Name, item.ID, senderId); } } @@ -432,7 +432,7 @@ namespace OpenSim.Region.Environment.Scenes { m_log.ErrorFormat( "[AGENT INVENTORY]: Failed to find item {0} to give to {1}", itemId, senderId); - + return; } } @@ -440,7 +440,7 @@ namespace OpenSim.Region.Environment.Scenes { m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemId.ToString() + ", no root folder"); return; - } + } } public void CopyInventoryItem(IClientAPI remoteClient, uint callbackID, LLUUID oldAgentID, LLUUID oldItemID, @@ -449,9 +449,9 @@ namespace OpenSim.Region.Environment.Scenes m_log.DebugFormat( "[AGENT INVENTORY]: CopyInventoryItem received by {0} with oldAgentID {1}, oldItemID {2}, new FolderID {3}, newName {4}", remoteClient.AgentId, oldAgentID, oldItemID, newFolderID, newName); - + InventoryItemBase item = CommsManager.UserProfileCacheService.libraryRoot.FindItem(oldItemID); - + if (item == null) { CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(oldAgentID); @@ -464,7 +464,7 @@ namespace OpenSim.Region.Environment.Scenes if (userInfo.RootFolder != null) { item = userInfo.RootFolder.FindItem(oldItemID); - + if (item == null) { m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString()); @@ -477,29 +477,29 @@ namespace OpenSim.Region.Environment.Scenes return; } } - - AssetBase asset + + AssetBase asset = AssetCache.GetAsset( item.AssetID, (item.AssetType == (int)AssetType.Texture ? true : false)); if (asset != null) { - if(remoteClient.AgentId == oldAgentID) - { - CreateNewInventoryItem( - remoteClient, newFolderID, callbackID, asset, item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions); - } - else - { - CreateNewInventoryItem( - remoteClient, newFolderID, callbackID, asset, item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, item.NextPermissions); - } + if (remoteClient.AgentId == oldAgentID) + { + CreateNewInventoryItem( + remoteClient, newFolderID, callbackID, asset, item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions); + } + else + { + CreateNewInventoryItem( + remoteClient, newFolderID, callbackID, asset, item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, item.NextPermissions); + } } else { m_log.ErrorFormat( "[AGENT INVENTORY]: Could not copy item {0} since asset {1} could not be found", - item.Name, item.AssetID); + item.Name, item.AssetID); } } @@ -530,18 +530,18 @@ namespace OpenSim.Region.Environment.Scenes "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId); CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - + if (userInfo == null) { m_log.Error("[AGENT INVENTORY]: Failed to find user " + remoteClient.AgentId.ToString()); - + return; } if (userInfo.RootFolder != null) { InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - + if (item != null) { if (newName != String.Empty) @@ -549,7 +549,7 @@ namespace OpenSim.Region.Environment.Scenes item.Name = newName; } item.Folder = folderID; - + userInfo.DeleteItem(item.ID); AddInventoryItem(remoteClient, item); @@ -557,23 +557,23 @@ namespace OpenSim.Region.Environment.Scenes else { m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemID.ToString()); - + return; } } else { m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemID.ToString() + ", no root folder"); - + return; } } private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID, AssetBase asset, uint nextOwnerMask) - { - CreateNewInventoryItem(remoteClient, folderID, callbackID, asset, nextOwnerMask, nextOwnerMask, 0, nextOwnerMask); - } + { + CreateNewInventoryItem(remoteClient, folderID, callbackID, asset, nextOwnerMask, nextOwnerMask, 0, nextOwnerMask); + } /// /// Create a new inventory item. @@ -586,9 +586,9 @@ namespace OpenSim.Region.Environment.Scenes private void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID folderID, uint callbackID, AssetBase asset, uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask) { - CachedUserInfo userInfo + CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - + if (userInfo != null) { InventoryItemBase item = new InventoryItemBase(); @@ -603,8 +603,8 @@ namespace OpenSim.Region.Environment.Scenes item.Folder = folderID; item.CurrentPermissions = currentMask; item.NextPermissions = nextOwnerMask; - item.EveryOnePermissions = everyoneMask; - item.BasePermissions = baseMask; + item.EveryOnePermissions = everyoneMask; + item.BasePermissions = baseMask; userInfo.AddItem(item); remoteClient.SendInventoryItemCreateUpdate(item); @@ -612,7 +612,7 @@ namespace OpenSim.Region.Environment.Scenes else { m_log.WarnFormat( - "No user details associated with client {0} uuid {1} in CreateNewInventoryItem!", + "No user details associated with client {0} uuid {1} in CreateNewInventoryItem!", remoteClient.Name, remoteClient.AgentId); } } @@ -637,12 +637,12 @@ namespace OpenSim.Region.Environment.Scenes byte wearableType, uint nextOwnerMask) { // m_log.DebugFormat("[AGENT INVENTORY]: Received request to create inventory item {0} in folder {1}", name, folderID); - + if (transactionID == LLUUID.Zero) { - CachedUserInfo userInfo + CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - + if (userInfo != null) { ScenePresence presence; @@ -666,7 +666,7 @@ namespace OpenSim.Region.Environment.Scenes else { m_log.ErrorFormat( - "userInfo for agent uuid {0} unexpectedly null in CreateNewInventoryItem", + "userInfo for agent uuid {0} unexpectedly null in CreateNewInventoryItem", remoteClient.AgentId); } } @@ -677,10 +677,10 @@ namespace OpenSim.Region.Environment.Scenes { agentTransactions.HandleItemCreationFromTransaction( remoteClient, transactionID, folderID, callbackID, description, - name, invType, assetType, wearableType, nextOwnerMask); + name, invType, assetType, wearableType, nextOwnerMask); } - + } } @@ -693,13 +693,13 @@ namespace OpenSim.Region.Environment.Scenes { CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - + if (userInfo == null) { m_log.WarnFormat( "[AGENT INVENTORY]: Failed to find user {0} {1} to delete inventory item {2}", remoteClient.Name, remoteClient.AgentId, itemID); - + return; } @@ -716,7 +716,7 @@ namespace OpenSim.Region.Environment.Scenes { CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - + if (userInfo == null) { m_log.Warn("[AGENT INVENTORY]: Failed to find user " + remoteClient.AgentId.ToString()); @@ -726,13 +726,13 @@ namespace OpenSim.Region.Environment.Scenes if (userInfo.RootFolder != null) { InventoryItemBase folder = userInfo.RootFolder.FindItem(folderID); - + if (folder != null) { m_log.WarnFormat( "[AGENT INVENTORY]: Remove folder not implemented in request by {0} {1} for {2}", - remoteClient.Name, remoteClient.AgentId, folderID); - + remoteClient.Name, remoteClient.AgentId, folderID); + // doesn't work just yet, commented out. will fix in next patch. // userInfo.DeleteItem(folder); } @@ -760,7 +760,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// public void RequestTaskInventory(IClientAPI remoteClient, uint primLocalID) - { + { SceneObjectGroup group = GetGroupByPrim(primLocalID); if (group != null) { @@ -808,7 +808,7 @@ namespace OpenSim.Region.Environment.Scenes localID); } } - + /// /// Move the given item in the given prim to a folder in the client's inventory /// @@ -819,33 +819,33 @@ namespace OpenSim.Region.Environment.Scenes public void MoveTaskInventoryItem(IClientAPI remoteClient, LLUUID folderId, uint primLocalId, LLUUID itemId) { SceneObjectPart part = GetSceneObjectPart(primLocalId); - + if (null == part) { m_log.WarnFormat( "[PRIM INVENTORY]: " + "Move of inventory item {0} from prim with local id {1} failed because the prim could not be found", itemId, primLocalId); - + return; - } - + } + TaskInventoryItem taskItem = part.GetInventoryItem(itemId); - + if (null == taskItem) { // Console already notified of error in GetInventoryItem return; } - + // Only owner can copy if (remoteClient.AgentId != taskItem.OwnerID) { return; } - + InventoryItemBase agentItem = new InventoryItemBase(); - + agentItem.ID = LLUUID.Random(); agentItem.Creator = taskItem.CreatorID; agentItem.Owner = remoteClient.AgentId; @@ -855,33 +855,33 @@ namespace OpenSim.Region.Environment.Scenes agentItem.AssetType = taskItem.Type; agentItem.InvType = taskItem.InvType; agentItem.Folder = folderId; - + if ((remoteClient.AgentId != taskItem.OwnerID) && ExternalChecks.ExternalChecksPropagatePermissions()) { agentItem.BasePermissions = taskItem.NextOwnerMask; agentItem.CurrentPermissions = taskItem.NextOwnerMask; agentItem.NextPermissions = taskItem.NextOwnerMask; - agentItem.EveryOnePermissions = taskItem.EveryoneMask & taskItem.NextOwnerMask; + agentItem.EveryOnePermissions = taskItem.EveryoneMask & taskItem.NextOwnerMask; } else { agentItem.BasePermissions = taskItem.BaseMask; agentItem.CurrentPermissions = taskItem.OwnerMask; agentItem.NextPermissions = taskItem.NextOwnerMask; - agentItem.EveryOnePermissions = taskItem.EveryoneMask; + agentItem.EveryOnePermissions = taskItem.EveryoneMask; } - + AddInventoryItem(remoteClient, agentItem); - if (!ExternalChecks.ExternalChecksBypassPermissions()) - { - if((taskItem.OwnerMask & (uint)PermissionMask.Copy) == 0) - part.RemoveInventoryItem(itemId); - } - + if (!ExternalChecks.ExternalChecksBypassPermissions()) + { + if ((taskItem.OwnerMask & (uint)PermissionMask.Copy) == 0) + part.RemoveInventoryItem(itemId); + } + } /// - /// Update an item in a prim (task) inventory. + /// Update an item in a prim (task) inventory. /// This method does not handle scripts, RezScript(IClientAPI, LLUUID, unit) /// /// @@ -915,14 +915,14 @@ namespace OpenSim.Region.Environment.Scenes { part.ParentGroup.AddInventoryItem(remoteClient, primLocalID, item, copyID); m_log.InfoFormat( - "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", + "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", item.Name, primLocalID, remoteClient.Name); part.ParentGroup.GetProperties(remoteClient); - if (!ExternalChecks.ExternalChecksBypassPermissions()) - { - if((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) - RemoveInventoryItem(remoteClient, itemID); - } + if (!ExternalChecks.ExternalChecksBypassPermissions()) + { + if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) + RemoveInventoryItem(remoteClient, itemID); + } } else { @@ -951,22 +951,22 @@ namespace OpenSim.Region.Environment.Scenes public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) { LLUUID copyID = LLUUID.Random(); - + if (itemID != LLUUID.Zero) { CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - + if (userInfo != null && userInfo.RootFolder != null) { InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - + // Try library // XXX clumsy, possibly should be one call if (null == item) { item = CommsManager.UserProfileCacheService.libraryRoot.FindItem(itemID); } - + if (item != null) { SceneObjectPart part = GetSceneObjectPart(localID); @@ -975,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); part.ParentGroup.StartScript(localID, copyID); part.ParentGroup.GetProperties(remoteClient); - + // m_log.InfoFormat("[PRIMINVENTORY]: " + // "Rezzed script {0} into prim local ID {1} for user {2}", // item.inventoryName, localID, remoteClient.Name); @@ -1000,10 +1000,10 @@ namespace OpenSim.Region.Environment.Scenes else // If the itemID is zero then the script has been rezzed directly in an object's inventory { // not yet implemented - // TODO Need to get more details from original RezScript packet + // TODO Need to get more details from original RezScript packet // XXX jc tmp // AssetBase asset = CreateAsset("chimney sweep", "sailor.lsl", 10, 10, null); -// AssetCache.AddAsset(asset); +// AssetCache.AddAsset(asset); } } @@ -1023,11 +1023,11 @@ namespace OpenSim.Region.Environment.Scenes else { foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) - { + { // m_log.DebugFormat( // "[AGENT INVENTORY]: Received request to derez {0} into folder {1}", // Data.ObjectLocalID, DeRezPacket.AgentBlock.DestinationID); - + EntityBase selectedEnt = null; //m_log.Info("[CLIENT]: LocalID:" + Data.ObjectLocalID.ToString()); @@ -1046,9 +1046,9 @@ namespace OpenSim.Region.Environment.Scenes bool permissionToTake = false; bool permissionToDelete = false; if (DeRezPacket.AgentBlock.Destination == 1)// Take Copy - { + { permissionToTake = ExternalChecks.ExternalChecksCanTakeCopyObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); - permissionToDelete = false; //Just taking copy! + permissionToDelete = false; //Just taking copy! } else if (DeRezPacket.AgentBlock.Destination == 4) //Take @@ -1094,27 +1094,27 @@ namespace OpenSim.Region.Environment.Scenes item.Folder = DeRezPacket.AgentBlock.DestinationID; if ((remoteClient.AgentId != objectGroup.RootPart.OwnerID) && ExternalChecks.ExternalChecksPropagatePermissions()) { - uint perms=objectGroup.GetEffectivePermissions(); - uint nextPerms=(perms & 7) << 13; - if((nextPerms & (uint)PermissionMask.Copy) == 0) - perms &= ~(uint)PermissionMask.Copy; - if((nextPerms & (uint)PermissionMask.Transfer) == 0) - perms &= ~(uint)PermissionMask.Transfer; - if((nextPerms & (uint)PermissionMask.Modify) == 0) - perms &= ~(uint)PermissionMask.Modify; + uint perms=objectGroup.GetEffectivePermissions(); + uint nextPerms=(perms & 7) << 13; + if ((nextPerms & (uint)PermissionMask.Copy) == 0) + perms &= ~(uint)PermissionMask.Copy; + if ((nextPerms & (uint)PermissionMask.Transfer) == 0) + perms &= ~(uint)PermissionMask.Transfer; + if ((nextPerms & (uint)PermissionMask.Modify) == 0) + perms &= ~(uint)PermissionMask.Modify; item.BasePermissions = perms & objectGroup.RootPart.NextOwnerMask; item.CurrentPermissions = item.BasePermissions; item.NextPermissions = objectGroup.RootPart.NextOwnerMask; - item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask; - item.CurrentPermissions |= 8; // Slam! + item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask; + item.CurrentPermissions |= 8; // Slam! } else { item.BasePermissions = objectGroup.GetEffectivePermissions(); item.CurrentPermissions = objectGroup.GetEffectivePermissions(); item.NextPermissions = objectGroup.RootPart.NextOwnerMask; - item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; + item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; } // TODO: add the new fields (Flags, Sale info, etc) @@ -1201,15 +1201,15 @@ namespace OpenSim.Region.Environment.Scenes item.BasePermissions = objectGroup.RootPart.NextOwnerMask; item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask; item.NextPermissions = objectGroup.RootPart.NextOwnerMask; - item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask; + item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask; } - else - { + else + { item.BasePermissions = objectGroup.GetEffectivePermissions(); item.CurrentPermissions = objectGroup.GetEffectivePermissions(); item.NextPermissions = objectGroup.RootPart.NextOwnerMask; - item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; - } + item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; + } userInfo.AddItem(item); @@ -1218,7 +1218,7 @@ namespace OpenSim.Region.Environment.Scenes { remoteClient.SendInventoryItemCreateUpdate(item); } - + } } } @@ -1250,7 +1250,7 @@ namespace OpenSim.Region.Environment.Scenes item.Name = asset.Name; item.AssetType = asset.Type; item.InvType = asset.InvType; - + // Sticking it in root folder for now.. objects folder later? item.Folder = userInfo.RootFolder.ID;// DeRezPacket.AgentBlock.DestinationID; @@ -1259,14 +1259,14 @@ namespace OpenSim.Region.Environment.Scenes item.BasePermissions = objectGroup.RootPart.NextOwnerMask; item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask; item.NextPermissions = objectGroup.RootPart.NextOwnerMask; - item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask; + item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask; } else { item.BasePermissions = objectGroup.RootPart.BaseMask; item.CurrentPermissions = objectGroup.RootPart.OwnerMask; item.NextPermissions = objectGroup.RootPart.NextOwnerMask; - item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; + item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; } userInfo.AddItem(item); @@ -1345,12 +1345,12 @@ namespace OpenSim.Region.Environment.Scenes LLVector3 scale = new LLVector3(0.5f, 0.5f, 0.5f); - + LLVector3 pos = GetNewRezLocation( - RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1), + RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1), BypassRayCast, bRayEndIsIntersection,true,scale, false); - - + + // Rez object CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); @@ -1359,14 +1359,14 @@ namespace OpenSim.Region.Environment.Scenes if (userInfo.RootFolder != null) { InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - + if (item != null) { AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false); if (rezAsset != null) { - string xmlData = Helpers.FieldToUTF8String(rezAsset.Data); + string xmlData = Helpers.FieldToUTF8String(rezAsset.Data); SceneObjectGroup group = new SceneObjectGroup(this, m_regionHandle, xmlData); if (!ExternalChecks.ExternalChecksCanRezObject(group.Children.Count,remoteClient.AgentId, pos) && !attachment) { @@ -1401,10 +1401,10 @@ namespace OpenSim.Region.Environment.Scenes if (attachment) isAttachment = " Object was an attachment"; - + m_log.Error("[OJECTREZ]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment); } - + // Since renaming the item in the inventory does not affect the name stored // in the serialization, transfer the correct name from the inventory to the // object itself before we rez. @@ -1413,18 +1413,18 @@ namespace OpenSim.Region.Environment.Scenes List partList = new List(group.Children.Values); - if(rootPart.OwnerID != item.Owner) - { - if((item.CurrentPermissions & 8) != 0) - { - foreach (SceneObjectPart part in partList) - { - part.EveryoneMask = item.EveryOnePermissions; - part.NextOwnerMask = item.NextPermissions; - } - } - group.ApplyNextOwnerPermissions(); - } + if (rootPart.OwnerID != item.Owner) + { + if ((item.CurrentPermissions & 8) != 0) + { + foreach (SceneObjectPart part in partList) + { + part.EveryoneMask = item.EveryOnePermissions; + part.NextOwnerMask = item.NextPermissions; + } + } + group.ApplyNextOwnerPermissions(); + } foreach (SceneObjectPart part in partList) { @@ -1434,13 +1434,13 @@ namespace OpenSim.Region.Environment.Scenes part.OwnerID = item.Owner; part.ChangeInventoryOwner(item.Owner); } - else if(((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam! - { + else if (((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam! + { part.EveryoneMask = item.EveryOnePermissions; part.NextOwnerMask = item.NextPermissions; - } + } } - + rootPart.TrimPermissions(); if (!attachment) @@ -1451,11 +1451,11 @@ namespace OpenSim.Region.Environment.Scenes } group.ApplyPhysics(m_physicalPrim); } - + group.StartScripts(); - + if (!attachment) rootPart.ScheduleFullUpdate(); @@ -1505,18 +1505,18 @@ namespace OpenSim.Region.Environment.Scenes List partList = new List(group.Children.Values); - if(rootPart.OwnerID != item.OwnerID) - { - if((item.OwnerMask & 8) != 0) - { - foreach (SceneObjectPart part in partList) - { - part.EveryoneMask = item.EveryoneMask; - part.NextOwnerMask = item.NextOwnerMask; - } - } - group.ApplyNextOwnerPermissions(); - } + if (rootPart.OwnerID != item.OwnerID) + { + if ((item.OwnerMask & 8) != 0) + { + foreach (SceneObjectPart part in partList) + { + part.EveryoneMask = item.EveryoneMask; + part.NextOwnerMask = item.NextOwnerMask; + } + } + group.ApplyNextOwnerPermissions(); + } foreach (SceneObjectPart part in partList) { @@ -1526,11 +1526,11 @@ namespace OpenSim.Region.Environment.Scenes part.OwnerID = item.OwnerID; part.ChangeInventoryOwner(item.OwnerID); } - else if((item.OwnerMask & 8) != 0) // Slam! - { - part.EveryoneMask = item.EveryoneMask; - part.NextOwnerMask = item.NextOwnerMask; - } + else if ((item.OwnerMask & 8) != 0) // Slam! + { + part.EveryoneMask = item.EveryoneMask; + part.NextOwnerMask = item.NextOwnerMask; + } } rootPart.TrimPermissions(); if (group.RootPart.Shape.PCode == (byte)PCode.Prim) @@ -1548,6 +1548,6 @@ namespace OpenSim.Region.Environment.Scenes } return null; } - + } } diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index f55d822..c486e28 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs @@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Scenes public partial class Scene { /// - /// + /// /// /// /// @@ -81,7 +81,7 @@ namespace OpenSim.Region.Environment.Scenes foreach (EntityBase ent in EntitieList) { if (ent is SceneObjectGroup) - { + { if (((SceneObjectGroup) ent).LocalId == primLocalID) { // A prim is only tainted if it's allowed to be edited by the person clicking it. @@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -139,10 +139,10 @@ namespace OpenSim.Region.Environment.Scenes agentId, groupId, final, groupOwned, removeContribution, parcelLocalID, parcelArea, parcelPrice, authenticated); // First, allow all validators a stab at it - m_eventManager.TriggerValidateLandBuy(this, args); + m_eventManager.TriggerValidateLandBuy(this, args); // Then, check validation and transfer - m_eventManager.TriggerLandBuy(this, args); + m_eventManager.TriggerLandBuy(this, args); } public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1964ef4..32dc7d5 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Scenes /// Each agent has its own capabilities handler. /// protected Dictionary m_capsHandlers = new Dictionary(); - + protected BaseHttpServer m_httpListener; protected Dictionary Modules = new Dictionary(); @@ -135,7 +135,7 @@ namespace OpenSim.Region.Environment.Scenes private int m_update_backup = 200; private int m_update_terrain = 50; private int m_update_land = 1; - + private int frameMS = 0; private int physicsMS2 = 0; @@ -201,7 +201,7 @@ namespace OpenSim.Region.Environment.Scenes get { return m_innerScene.Entities; } set { m_innerScene.Entities = value; } } - + public Dictionary m_restorePresences { get { return m_innerScene.RestorePresences; } @@ -324,14 +324,14 @@ namespace OpenSim.Region.Environment.Scenes public override bool OtherRegionUp(RegionInfo otherRegion) { - // Another region is up. + // Another region is up. // Gets called from Grid Comms (SceneCommunicationService<---RegionListener<----LocalBackEnd<----OGS1) - // We have to tell all our ScenePresences about it.. + // We have to tell all our ScenePresences about it.. // and add it to the neighbor list. // We only add it to the neighbor list if it's within 1 region from here. - // Agents may have draw distance values that cross two regions though, so - // we add it to the notify list regardless of distance. + // Agents may have draw distance values that cross two regions though, so + // we add it to the notify list regardless of distance. // We'll check the agent's draw distance before notifying them though. @@ -339,9 +339,9 @@ namespace OpenSim.Region.Environment.Scenes { for (int i = 0; i < m_neighbours.Count; i++) { - // The purpose of this loop is to re-update the known neighbors + // The purpose of this loop is to re-update the known neighbors // when another region comes up on top of another one. - // The latest region in that location ends up in the + // The latest region in that location ends up in the // 'known neighbors list' // Additionally, the commFailTF property gets reset to false. if (m_neighbours[i].RegionHandle == otherRegion.RegionHandle) @@ -354,7 +354,7 @@ namespace OpenSim.Region.Environment.Scenes } // If the value isn't in the neighbours, add it. - // If the RegionInfo isn't exact but is for the same XY World location, + // If the RegionInfo isn't exact but is for the same XY World location, // then the above loop will fix that. if (!(CheckNeighborRegion(otherRegion))) @@ -431,8 +431,8 @@ namespace OpenSim.Region.Environment.Scenes } } return found; - - + + } public virtual void Restart(float seconds) { @@ -461,8 +461,8 @@ namespace OpenSim.Region.Environment.Scenes } } - // The Restart timer has occured. - // We have to figure out if this is a notification or if the number of seconds specified in Restart + // The Restart timer has occured. + // We have to figure out if this is a notification or if the number of seconds specified in Restart // have elapsed. // If they have elapsed, call RestartNow() public void RestartTimer_Elapsed(object sender, ElapsedEventArgs e) @@ -500,7 +500,7 @@ namespace OpenSim.Region.Environment.Scenes } // This is a helper function that notifies root agents in this region that a new sim near them has come up - // This is in the form of a timer because when an instance of OpenSim.exe is started, + // This is in the form of a timer because when an instance of OpenSim.exe is started, // Even though the sims initialize, they don't listen until 'all of the sims are initialized' // If we tell an agent about a sim that's not listening yet, the agent will not be able to connect to it. // subsequently the agent will never see the region come back online. @@ -730,7 +730,7 @@ namespace OpenSim.Region.Environment.Scenes if (m_frame % m_update_entities == 0) m_innerScene.UpdateEntities(); - // run through entities that have scheduled themselves for + // run through entities that have scheduled themselves for // updates looking for updates(faster) if (m_frame % m_update_entitiesquick == 0) m_innerScene.ProcessUpdates(); @@ -743,13 +743,13 @@ namespace OpenSim.Region.Environment.Scenes { if (m_frame % m_update_events == 0) UpdateEvents(); - + if (m_frame % m_update_backup == 0) UpdateStorageBackup(); - + if (m_frame % m_update_terrain == 0) UpdateTerrain(); - + if (m_frame % m_update_land == 0) UpdateLand(); otherMS = System.Environment.TickCount - otherMS; @@ -800,14 +800,14 @@ namespace OpenSim.Region.Environment.Scenes // Get actual time dilation float tmpval = (m_timespan / (float)SinceLastFrame.TotalSeconds); - // If actual time dilation is greater then one, we're catching up, so subtract + // If actual time dilation is greater then one, we're catching up, so subtract // the amount that's greater then 1 from the time dilation if (tmpval > 1.0) { tmpval = tmpval - (tmpval - 1.0f); } m_timedilation = tmpval; - + m_lastupdate = DateTime.Now; } } @@ -858,9 +858,9 @@ namespace OpenSim.Region.Environment.Scenes { ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); }); } - + /// - /// + /// /// /// public bool Backup() @@ -929,7 +929,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// Loads the World heightmap /// - /// + /// public override void LoadWorldMap() { try @@ -946,7 +946,7 @@ namespace OpenSim.Region.Environment.Scenes { Heightmap = new TerrainChannel(map); } - + } catch (Exception e) { @@ -961,13 +961,13 @@ namespace OpenSim.Region.Environment.Scenes public void RegisterRegionWithGrid() { RegisterCommsEvents(); - + // These two 'commands' *must be* next to each other or sim rebooting fails. m_sceneGridService.RegisterRegion(RegionInfo); m_sceneGridService.InformNeighborsThatRegionisUp(RegionInfo); - + Dictionary dGridSettings = m_sceneGridService.GetGridSettings(); - + if (dGridSettings.ContainsKey("allow_forceful_banlines")) { if (dGridSettings["allow_forceful_banlines"] != "TRUE") @@ -984,11 +984,11 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void CreateTerrainTexture(bool temporary) { - //create a texture asset of the terrain + //create a texture asset of the terrain IMapImageGenerator terrain = RequestModuleInterface(); // Cannot create a map for a nonexistant heightmap yet. @@ -1129,7 +1129,7 @@ namespace OpenSim.Region.Environment.Scenes AssetCache.AddAsset(asset); } } - + } #endregion @@ -1211,7 +1211,7 @@ namespace OpenSim.Region.Environment.Scenes if (RayTargetID != LLUUID.Zero) { SceneObjectPart target = GetSceneObjectPart(RayTargetID); - + LLVector3 direction = LLVector3.Norm(RayEnd - RayStart); Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z); Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z); @@ -1220,9 +1220,9 @@ namespace OpenSim.Region.Environment.Scenes { pos = target.AbsolutePosition; //m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString()); - + // TODO: Raytrace better here - + //EntityIntersection ei = m_innerScene.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection)); Ray NewRay = new Ray(AXOrigin, AXdirection); @@ -1246,13 +1246,13 @@ namespace OpenSim.Region.Environment.Scenes // Set the position to the intersection point LLVector3 offset = (normal * (ScaleOffset / 2f)); pos = (intersectionpoint + offset); - + // Un-offset the prim (it gets offset later by the consumer method) pos.Z -= 0.25F; - - } - - + + } + + return pos; } else @@ -1267,8 +1267,8 @@ namespace OpenSim.Region.Environment.Scenes if (ei.HitTF) { pos = new LLVector3(ei.ipoint.x, ei.ipoint.y, ei.ipoint.z); - } - + } + return pos; } } @@ -1284,7 +1284,7 @@ namespace OpenSim.Region.Environment.Scenes byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID, byte RayEndIsIntersection) { - + LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f,0.5f,0.5f), false); if ( ExternalChecks.ExternalChecksCanRezObject(1,ownerID,pos)) @@ -1386,11 +1386,11 @@ namespace OpenSim.Region.Environment.Scenes /// /// Locate New region Handle and offset the prim position for the new region - /// + /// /// /// current position of Group /// Scene Object Group that we're crossing - + public void CrossPrimGroupIntoNewRegion(LLVector3 position, SceneObjectGroup grp) { if (grp == null) @@ -1424,7 +1424,7 @@ namespace OpenSim.Region.Environment.Scenes pos.X = ((pos.X - Constants.RegionSize)); newRegionHandle = Util.UIntsToLong((uint)((thisx + 1) * Constants.RegionSize), (uint)(thisy * Constants.RegionSize)); - + // x + 1 } else if (position.X < -0.1f) @@ -1449,7 +1449,7 @@ namespace OpenSim.Region.Environment.Scenes // Offset the positions for the new region across the border grp.OffsetForNewRegion(pos); - + CrossPrimGroupIntoNewRegion(newRegionHandle, grp); } @@ -1507,7 +1507,7 @@ namespace OpenSim.Region.Environment.Scenes if (sp != null) { // hack assetID until we get assetID into the XML format. - // LastOwnerID is used for group deeding, so when you do stuff + // LastOwnerID is used for group deeding, so when you do stuff // with the deeded object, it goes back to them grp.SetFromAssetID(grp.RootPart.LastOwnerID); @@ -1515,7 +1515,7 @@ namespace OpenSim.Region.Environment.Scenes } } } - + } } @@ -1533,16 +1533,16 @@ namespace OpenSim.Region.Environment.Scenes #region Add/Remove Avatar Methods /// - /// + /// /// - /// public override void AddNewClient(IClientAPI client, bool child) { m_log.DebugFormat( - "[CONNECTION DEBUGGING]: Creating new client for {0} at {1}", + "[CONNECTION DEBUGGING]: Creating new client for {0} at {1}", client.AgentId, RegionInfo.RegionName); - + SubscribeToClientEvents(client); ScenePresence presence; @@ -1618,7 +1618,7 @@ namespace OpenSim.Region.Environment.Scenes client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay; client.OnUpdatePrimFlags += m_innerScene.UpdatePrimFlags; client.OnRequestObjectPropertiesFamily += m_innerScene.RequestObjectPropertiesFamily; - + client.OnRequestGodlikePowers += handleRequestGodlikePowers; client.OnGodKickUser += HandleGodlikeKickUser; client.OnObjectPermissions += HandleObjectPermissionsUpdate; @@ -1655,7 +1655,7 @@ namespace OpenSim.Region.Environment.Scenes client.OnSetStartLocationRequest += SetHomeRezPoint; client.OnUndo += m_innerScene.HandleUndo; - + EventManager.TriggerOnNewClient(client); } public virtual void TeleportClientHome(LLUUID AgentId, IClientAPI client) @@ -1669,14 +1669,14 @@ namespace OpenSim.Region.Environment.Scenes RequestTeleportLocation(client, homeRegion, homePostion,homeLookat,(uint)0); } } - + public void doObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID, LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) - { + { LLVector3 pos; const bool frontFacesOnly = true; - + SceneObjectPart target = GetSceneObjectPart(localID); SceneObjectPart target2 = GetSceneObjectPart(RayTargetObj); @@ -1685,8 +1685,8 @@ namespace OpenSim.Region.Environment.Scenes LLVector3 direction = LLVector3.Norm(RayEnd - RayStart); Vector3 AXOrigin = new Vector3(RayStart.X, RayStart.Y, RayStart.Z); - Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z); - + Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z); + if (target2.ParentGroup != null) { pos = target2.AbsolutePosition; @@ -1717,7 +1717,7 @@ namespace OpenSim.Region.Environment.Scenes LLVector3 normal = new LLVector3(ei.normal.x, ei.normal.y, ei.normal.z); LLVector3 offset = (normal * (ScaleOffset / 2f)); pos = (intersectionpoint + offset); - + if (CopyCenters) { // now we cast a ray from inside the prim(absolute position) to one of it's faces along the face normal. @@ -1735,7 +1735,7 @@ namespace OpenSim.Region.Environment.Scenes normal.Z = ei2.normal.z; } } - + // Set the position to the intersection point offset = (normal * (ScaleOffset / 2f)); pos = (intersectionpoint + offset); @@ -1749,8 +1749,8 @@ namespace OpenSim.Region.Environment.Scenes return; } return; - - + + } @@ -1776,7 +1776,7 @@ namespace OpenSim.Region.Environment.Scenes UserProfile.HomeLookAtY = (int)lookAt.Y; UserProfile.HomeLookAtZ = (int)lookAt.Z; CommsManager.UserService.UpdateUserProfileProperties(UserProfile); - + remoteClient.SendAgentAlertMessage("Set home to here if supported by login service",false); } else @@ -1784,7 +1784,7 @@ namespace OpenSim.Region.Environment.Scenes remoteClient.SendAgentAlertMessage("Set Home request Failed",false); } } - + protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) { AvatarAppearance appearance; @@ -1844,7 +1844,7 @@ namespace OpenSim.Region.Environment.Scenes m_sceneGridService.SendCloseChildAgentConnections(agentID, childknownRegions); RemoveCapsHandler(agentID); - + CommsManager.UserProfileCacheService.RemoveUser(agentID); } @@ -1870,7 +1870,7 @@ namespace OpenSim.Region.Environment.Scenes ForEachScenePresence( delegate(ScenePresence presence) { presence.CoarseLocationChange(); }); - + IAgentAssetTransactions agentTransactions = this.RequestModuleInterface(); if (agentTransactions != null) { @@ -1921,7 +1921,7 @@ namespace OpenSim.Region.Environment.Scenes } //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); - //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); + //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); } public void HandleRemoveKnownRegionsFromAvatar(LLUUID avatarID, List regionslst) @@ -1931,7 +1931,7 @@ namespace OpenSim.Region.Environment.Scenes { lock (av) { - + for (int i = 0; i < regionslst.Count; i++) { av.KnownChildRegions.Remove(regionslst[i]); @@ -1957,7 +1957,7 @@ namespace OpenSim.Region.Environment.Scenes #region Entities /// - /// + /// /// /// /// @@ -1983,7 +1983,7 @@ namespace OpenSim.Region.Environment.Scenes #region RegionComms /// - /// + /// /// public void RegisterCommsEvents() { @@ -1999,7 +1999,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void UnRegisterReginWithComms() { @@ -2026,7 +2026,7 @@ namespace OpenSim.Region.Environment.Scenes if (regionHandle == m_regInfo.RegionHandle) { capsPaths[agent.AgentID] = agent.CapsPath; - + if (!agent.child) { AddCapsHandler(agent.AgentID); @@ -2041,44 +2041,44 @@ namespace OpenSim.Region.Environment.Scenes } } } - + m_log.DebugFormat( "[CONNECTION DEBUGGING]: Creating new circuit code ({0}) for avatar {1} at {2}", agent.circuitcode, agent.AgentID, RegionInfo.RegionName); - + m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); } else { m_log.WarnFormat( - "[CONNECTION DEBUGGING]: Skipping this region for welcoming avatar {0} [{1}] at {2}", + "[CONNECTION DEBUGGING]: Skipping this region for welcoming avatar {0} [{1}] at {2}", agent.AgentID, regionHandle, RegionInfo.RegionName); } - } + } /// /// Add a caps handler for the given agent. If the CAPS handler already exists for this agent, /// then it is replaced by a new CAPS handler. - /// + /// /// FIXME: On login this is called twice, once for the login and once when the connection is made. /// This is somewhat innefficient and should be fixed. The initial login creation is necessary /// since the client asks for capabilities immediately after being informed of the seed. /// - /// - /// + /// + /// public void AddCapsHandler(LLUUID agentId) - { - String capsObjectPath = GetCapsPath(agentId); + { + String capsObjectPath = GetCapsPath(agentId); m_log.DebugFormat( "[CAPS]: Setting up CAPS handler for root agent {0} in {1}", agentId, RegionInfo.RegionName); - + Caps cap = new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port, capsObjectPath, agentId, m_dumpAssetsToFile, RegionInfo.RegionName); cap.RegisterHandlers(); - + EventManager.TriggerOnRegisterCaps(agentId, cap); cap.AddNewInventoryItem = AddInventoryItem; @@ -2087,7 +2087,7 @@ namespace OpenSim.Region.Environment.Scenes cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS; cap.GetClient = m_innerScene.GetControllingClient; m_capsHandlers[agentId] = cap; - } + } /// /// Remove the caps handler for a given agent. @@ -2100,9 +2100,9 @@ namespace OpenSim.Region.Environment.Scenes if (m_capsHandlers.ContainsKey(agentId)) { m_log.DebugFormat( - "[CAPS]: Removing CAPS handler for root agent {0} in {1}", + "[CAPS]: Removing CAPS handler for root agent {0} in {1}", agentId, RegionInfo.RegionName); - + m_capsHandlers[agentId].DeregisterHandlers(); EventManager.TriggerOnDeregisterCaps(agentId, m_capsHandlers[agentId]); @@ -2118,7 +2118,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2152,8 +2152,8 @@ namespace OpenSim.Region.Environment.Scenes ScenePresence childAgentUpdate = GetScenePresence(new LLUUID(cAgentData.AgentID)); if (childAgentUpdate != null) { - // I can't imagine *yet* why we would get an update if the agent is a root agent.. - // however to avoid a race condition crossing borders.. + // I can't imagine *yet* why we would get an update if the agent is a root agent.. + // however to avoid a race condition crossing borders.. if (childAgentUpdate.IsChildAgent) { uint rRegionX = (uint)(cAgentData.regionHandle >> 40); @@ -2193,7 +2193,7 @@ namespace OpenSim.Region.Environment.Scenes } // Tell a single agent to disconnect from the region. presence.ControllingClient.SendShutdownConnectionNotice(); - + presence.ControllingClient.Close(true); } } @@ -2202,11 +2202,11 @@ namespace OpenSim.Region.Environment.Scenes /// /// Tell neighboring regions about this agent - /// When the regions respond with a true value, + /// When the regions respond with a true value, /// tell the agents about the region. - /// + /// /// We have to tell the regions about the agents first otherwise it'll deny them access - /// + /// /// /// public void InformClientOfNeighbours(ScenePresence presence) @@ -2309,7 +2309,7 @@ namespace OpenSim.Region.Environment.Scenes #region Module Methods /// - /// + /// /// /// /// @@ -2379,21 +2379,21 @@ namespace OpenSim.Region.Environment.Scenes m_statsReporter.SetObjectCapacity(objects); } objectCapacity = objects; - + } public List GetFriendList(LLUUID avatarID) { return CommsManager.GetUserFriendList(avatarID); } - + #endregion #region Other Methods /// - /// + /// /// /// public void SetTimePhase(int phase) @@ -2402,7 +2402,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2437,7 +2437,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2451,14 +2451,14 @@ namespace OpenSim.Region.Environment.Scenes } return LLUUID.Zero; } - + /// - /// This method is a way for the Friends Module to create an instant - /// message to the avatar and for Instant Messages that travel across + /// This method is a way for the Friends Module to create an instant + /// message to the avatar and for Instant Messages that travel across /// gridcomms to make it to the Instant Message Module. - /// - /// Friendship establishment and groups are unfortunately tied with instant messaging and + /// + /// Friendship establishment and groups are unfortunately tied with instant messaging and /// there's no way to separate them completely. /// /// object containing the instant message data @@ -2525,7 +2525,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// public void SendGeneralAlert(string message) @@ -2539,7 +2539,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2556,7 +2556,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2569,7 +2569,7 @@ namespace OpenSim.Region.Environment.Scenes { // User needs to be logged into this sim if (m_scenePresences.ContainsKey(agentID)) - { + { // First check that this is the sim owner if (ExternalChecks.ExternalChecksCanBeGodLike(agentID)) { @@ -2632,8 +2632,8 @@ namespace OpenSim.Region.Environment.Scenes /// /// Kicks User specified from the simulator. This logs them off of the grid - /// If the client gets the UUID: 44e87126e7944ded05b37c42da3d5cdb it assumes - /// that you're kicking it even if the avatar's UUID isn't the UUID that the + /// If the client gets the UUID: 44e87126e7944ded05b37c42da3d5cdb it assumes + /// that you're kicking it even if the avatar's UUID isn't the UUID that the /// agent is assigned /// /// The person doing the kicking @@ -2662,7 +2662,7 @@ namespace OpenSim.Region.Environment.Scenes } ); - + // This is a bit crude. It seems the client will be null before it actually stops the thread // The thread will kill itself eventually :/ // Is there another way to make sure *all* clients get this 'inter region' message? @@ -2722,7 +2722,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2743,7 +2743,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// public void HandleAlertCommand(string[] commandParams) @@ -2931,7 +2931,7 @@ namespace OpenSim.Region.Environment.Scenes private bool m_dumpAssetsToFile; /// - /// + /// /// /// public void AddScriptEngine(ScriptEngineInterface scriptEngine) @@ -2978,7 +2978,7 @@ namespace OpenSim.Region.Environment.Scenes { return false; } - } + } else { if (part.OwnerID == parcel.landData.ownerID) @@ -2996,7 +2996,7 @@ namespace OpenSim.Region.Environment.Scenes if (pos.X > 0f && pos.X < Constants.RegionSize && pos.Y > 0f && pos.Y < Constants.RegionSize) { - // The only time parcel != null when an object is inside a region is when + // The only time parcel != null when an object is inside a region is when // there is nothing behind the landchannel. IE, no land plugin loaded. return true; } @@ -3027,7 +3027,7 @@ namespace OpenSim.Region.Environment.Scenes public bool pipeEventsForScript(uint localID) { - + SceneObjectPart part = GetSceneObjectPart(localID); if (part != null) { @@ -3046,7 +3046,7 @@ namespace OpenSim.Region.Environment.Scenes #region InnerScene wrapper methods /// - /// + /// /// /// /// @@ -3071,7 +3071,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// public void SendAllSceneObjectsToClient(ScenePresence presence) @@ -3080,10 +3080,10 @@ namespace OpenSim.Region.Environment.Scenes } //The idea is to have a group of method that return a list of avatars meeting some requirement - // ie it could be all m_scenePresences within a certain range of the calling prim/avatar. + // ie it could be all m_scenePresences within a certain range of the calling prim/avatar. /// - /// + /// /// /// public List GetAvatars() @@ -3132,7 +3132,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// public void ForEachScenePresence(Action action) @@ -3154,13 +3154,13 @@ namespace OpenSim.Region.Environment.Scenes } } } - + /// /// Delete this object from the scene. /// /// public void DeleteSceneObjectGroup(SceneObjectGroup group) - { + { SceneObjectPart rootPart = (group).GetChildPart(group.UUID); if (rootPart.PhysActor != null) { @@ -3177,18 +3177,18 @@ namespace OpenSim.Region.Environment.Scenes m_innerScene.RemoveAPrimCount(); } group.DeleteParts(); - + // In case anybody else retains a reference to this group, signal deletion by changing the name // to null. We can't zero out the UUID because this is taken from the root part, which has already // been removed. // FIXME: This is a really poor temporary solution, since it still leaves plenty of scope for race // conditions where a user deletes an entity while it is being stored. Really, the update // code needs a redesign. - group.Name = null; - } + group.Name = null; + } /// - /// + /// /// /// // public void ForEachObject(Action action) @@ -3207,7 +3207,7 @@ namespace OpenSim.Region.Environment.Scenes // } /// - /// + /// /// /// /// @@ -3217,7 +3217,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index dc67436..fbef367 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs @@ -77,11 +77,11 @@ namespace OpenSim.Region.Environment.Scenes { get { return m_externalChecks; } } - + protected string m_datastore; private uint m_nextLocalId = 8880000; - + private AssetCache m_assetCache; public AssetCache AssetCache @@ -89,8 +89,8 @@ namespace OpenSim.Region.Environment.Scenes get { return m_assetCache; } set { m_assetCache = value; } } - - protected RegionStatus m_regStatus; + + protected RegionStatus m_regStatus; public RegionStatus Region_Status { @@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Scenes #region Add/Remove Agent/Avatar /// - /// + /// /// /// /// @@ -138,7 +138,7 @@ namespace OpenSim.Region.Environment.Scenes public abstract void AddNewClient(IClientAPI client, bool child); /// - /// + /// /// /// public abstract void RemoveClient(LLUUID agentID); @@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes #endregion /// - /// + /// /// /// public virtual RegionInfo RegionInfo @@ -206,7 +206,7 @@ namespace OpenSim.Region.Environment.Scenes } #endregion - + /// /// XXX These two methods are very temporary /// @@ -217,7 +217,7 @@ namespace OpenSim.Region.Environment.Scenes { return capsPaths[agentId]; } - + return null; } } diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 18ce61a..885d1e9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing; regionCommsHost.OnCloseAgentConnection += CloseConnection; regionCommsHost.OnRegionUp += newRegionUp; - regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate; + regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate; } else { @@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Scenes #region CommsManager Event handlers /// - /// + /// /// /// /// @@ -289,7 +289,7 @@ namespace OpenSim.Region.Environment.Scenes agent.child = true; InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; - + try { d.BeginInvoke(avatar, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, @@ -299,20 +299,20 @@ namespace OpenSim.Region.Environment.Scenes catch (Exception e) { m_log.ErrorFormat( - "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3}). {4}", - neighbours[i].ExternalHostName, - neighbours[i].RegionHandle, - neighbours[i].RegionLocX, + "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3}). {4}", + neighbours[i].ExternalHostName, + neighbours[i].RegionHandle, + neighbours[i].RegionLocX, neighbours[i].RegionLocY, e); - + // FIXME: Okay, even though we've failed, we're still going to throw the exception on, // since I don't know what will happen if we just let the client continue - + // XXX: Well, decided to swallow the exception instead for now. Let us see how that goes. - // throw e; - - } + // throw e; + + } } } } @@ -362,12 +362,12 @@ namespace OpenSim.Region.Environment.Scenes { m_log.Info("[INTERGRID]: Completed informing neighbors that I'm here"); handlerRegionUp = OnRegionUp; - + // yes, we're notifying ourselves. if (handlerRegionUp != null) handlerRegionUp(region); - + } else { @@ -407,9 +407,9 @@ namespace OpenSim.Region.Environment.Scenes /// /// This informs all neighboring regions about the settings of it's child agent. /// Calls an asynchronous method to do so.. so it doesn't lag the sim. - /// + /// /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc. - /// + /// /// private void SendChildAgentDataUpdateAsync(ChildAgentDataUpdate cAgentData, ScenePresence presence) { @@ -468,14 +468,14 @@ namespace OpenSim.Region.Environment.Scenes if (regionAccepted) { m_log.Info("[INTERGRID]: Completed sending agent Close agent Request to neighbor"); - + } else { m_log.Info("[INTERGRID]: Failed sending agent Close agent Request to neighbor"); - + } - + } // We remove the list of known regions from the agent's known region list through an event // to scene, because, if an agent logged of, it's likely that there will be no scene presence @@ -572,25 +572,25 @@ namespace OpenSim.Region.Environment.Scenes if (destRegionUp) { avatar.Close(); - - // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport + + // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport // failure at this point (unlike a border crossing failure). So perhaps this can never fail // once we reach here... avatar.Scene.RemoveCapsHandler(avatar.UUID); - + m_commsProvider.InterRegion.InformRegionOfChildAgent(regionHandle, agent); m_commsProvider.InterRegion.ExpectAvatarCrossing(regionHandle, avatar.ControllingClient.AgentId, position, false); AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo(); - + // TODO Should construct this behind a method - string capsPath = - "http://" + reg.ExternalHostName + ":" + reg.HttpPort - + "/CAPS/" + circuitdata.CapsPath + "0000/"; - + string capsPath = + "http://" + reg.ExternalHostName + ":" + reg.HttpPort + + "/CAPS/" + circuitdata.CapsPath + "0000/"; + m_log.DebugFormat( - "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); - + "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); + avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath); avatar.MakeChildAgent(); @@ -618,7 +618,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs index dacd609..7ff9213 100644 --- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs +++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs @@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Scenes public delegate void DeregisterCapsEvent(LLUUID agentID, Caps caps); public event DeregisterCapsEvent OnDeregisterCaps; - public class MoneyTransferArgs : EventArgs + public class MoneyTransferArgs : EventArgs { public LLUUID sender; public LLUUID receiver; @@ -208,7 +208,7 @@ namespace OpenSim.Region.Environment.Scenes public class LandBuyArgs : EventArgs { public LLUUID agentId = LLUUID.Zero; - + public LLUUID groupId = LLUUID.Zero; public LLUUID parcelOwnerID = LLUUID.Zero; @@ -225,9 +225,9 @@ namespace OpenSim.Region.Environment.Scenes public int transactionID = 0; public int amountDebited = 0; - + public LandBuyArgs(LLUUID pagentId, LLUUID pgroupId, bool pfinal, bool pgroupOwned, - bool premoveContribution, int pparcelLocalID, int pparcelArea, int pparcelPrice, + bool premoveContribution, int pparcelLocalID, int pparcelArea, int pparcelPrice, bool pauthenticated) { agentId = pagentId; @@ -367,7 +367,7 @@ namespace OpenSim.Region.Environment.Scenes if (handlerParcelPrimCountUpdate != null) { handlerParcelPrimCountUpdate(); - } + } } public void TriggerMoneyTransfer(Object sender, MoneyTransferArgs e) @@ -538,7 +538,7 @@ namespace OpenSim.Region.Environment.Scenes } } - public void TriggerOnRegisterCaps(LLUUID agentID, Caps caps) + public void TriggerOnRegisterCaps(LLUUID agentID, Caps caps) { handlerRegisterCaps = OnRegisterCaps; if (handlerRegisterCaps != null) @@ -547,7 +547,7 @@ namespace OpenSim.Region.Environment.Scenes } } - public void TriggerOnDeregisterCaps(LLUUID agentID, Caps caps) + public void TriggerOnDeregisterCaps(LLUUID agentID, Caps caps) { handlerDeregisterCaps = OnDeregisterCaps; if (handlerDeregisterCaps != null) @@ -580,7 +580,7 @@ namespace OpenSim.Region.Environment.Scenes handlerValidateLandBuy(sender, e); } } - + public void TriggerAtTargetEvent(uint localID, uint handle, LLVector3 targetpos, LLVector3 currentpos) { handlerScriptAtTargetEvent = OnScriptAtTargetEvent; diff --git a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs index 645c302..040ee70 100644 --- a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs +++ b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs @@ -61,19 +61,19 @@ namespace OpenSim.Region.Environment.Scenes public uint ExternalChecksGenerateClientFlags(LLUUID userID, LLUUID objectID) { - SceneObjectPart part=m_scene.GetSceneObjectPart(objectID); + SceneObjectPart part=m_scene.GetSceneObjectPart(objectID); - uint perms=part.GetEffectiveObjectFlags() | - (uint)LLObject.ObjectFlags.ObjectModify | - (uint)LLObject.ObjectFlags.ObjectCopy | - (uint)LLObject.ObjectFlags.ObjectMove | - (uint)LLObject.ObjectFlags.ObjectTransfer | - (uint)LLObject.ObjectFlags.ObjectYouOwner | - (uint)LLObject.ObjectFlags.ObjectYouOfficer; + uint perms=part.GetEffectiveObjectFlags() | + (uint)LLObject.ObjectFlags.ObjectModify | + (uint)LLObject.ObjectFlags.ObjectCopy | + (uint)LLObject.ObjectFlags.ObjectMove | + (uint)LLObject.ObjectFlags.ObjectTransfer | + (uint)LLObject.ObjectFlags.ObjectYouOwner | + (uint)LLObject.ObjectFlags.ObjectYouOfficer; foreach (GenerateClientFlags check in GenerateClientFlagsCheckFunctions) { - perms &= check(userID, objectID); + perms &= check(userID, objectID); } return perms; } diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index 215ab75..8f3de51 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs @@ -180,7 +180,7 @@ namespace OpenSim.Region.Environment.Scenes [Obsolete("TODO: Remove this warning by 0.7")] public bool RunTerrainCmdOnCurrentScene(string[] cmdparams, ref string result) { - m_log.Warn("DEPRECIATED: The terrain engine has been replaced with a new terrain plugin module. Please type 'plugin terrain help' for new commands."); + m_log.Warn("DEPRECIATED: The terrain engine has been replaced with a new terrain plugin module. Please type 'plugin terrain help' for new commands."); return false; } @@ -253,7 +253,7 @@ namespace OpenSim.Region.Environment.Scenes public bool TrySetCurrentScene(LLUUID regionID) { Console.WriteLine("Searching for Region: '{0}'", regionID.ToString()); - + foreach (Scene scene in m_localScenes) { if (scene.RegionInfo.RegionID == regionID) @@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes return true; } } - + return false; } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index 8a7096f..1ac51a6 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs @@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Scenes if (part != null) { part.StartScript(itemID); - + } else { @@ -58,9 +58,9 @@ namespace OpenSim.Region.Environment.Scenes "[PRIM INVENTORY]: " + "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", localID, Name, UUID, itemID); - } + } } - + // /// Start a given script. // /// // /// @@ -79,9 +79,9 @@ namespace OpenSim.Region.Environment.Scenes // "[PRIM INVENTORY]: " + // "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", // localID, Name, UUID, itemID); -// } -// } - +// } +// } + /// /// Start the scripts contained in all the prims in this group. /// @@ -107,7 +107,7 @@ namespace OpenSim.Region.Environment.Scenes } } } - + /// Start a given script. /// /// @@ -127,11 +127,11 @@ namespace OpenSim.Region.Environment.Scenes "[PRIM INVENTORY]: " + "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}", partID, Name, UUID, itemID); - } - } - + } + } + /// - /// + /// /// /// /// @@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Scenes localID, Name, UUID); } } - + /// /// Add an inventory item to a prim in this group. /// @@ -181,7 +181,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// The item UUID that should be used by the new item. /// - public bool AddInventoryItem(IClientAPI remoteClient, uint localID, + public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item, LLUUID copyItemID) { LLUUID newItemId = (copyItemID != LLUUID.Zero) ? copyItemID : item.ID; @@ -190,8 +190,8 @@ namespace OpenSim.Region.Environment.Scenes if (part != null) { TaskInventoryItem taskItem = new TaskInventoryItem(); - - taskItem.ItemID = newItemId; + + taskItem.ItemID = newItemId; taskItem.AssetID = item.AssetID; taskItem.Name = item.Name; taskItem.Description = item.Description; @@ -199,15 +199,15 @@ namespace OpenSim.Region.Environment.Scenes taskItem.CreatorID = item.Creator; taskItem.Type = item.AssetType; taskItem.InvType = item.InvType; - + taskItem.BaseMask = item.BasePermissions; taskItem.OwnerMask = item.CurrentPermissions; // FIXME: ignoring group permissions for now as they aren't stored in item taskItem.EveryoneMask = item.EveryOnePermissions; taskItem.NextOwnerMask = item.NextPermissions; - + part.AddInventoryItem(taskItem); - + return true; } else @@ -220,7 +220,7 @@ namespace OpenSim.Region.Environment.Scenes return false; } - + /// /// Returns an existing inventory item. Returns the original, so any changes will be live. /// @@ -240,11 +240,11 @@ namespace OpenSim.Region.Environment.Scenes "[PRIM INVENTORY]: " + "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}", primID, part.Name, part.UUID, itemID); - } - + } + return null; - } - + } + /// /// Update an existing inventory item. /// @@ -256,8 +256,8 @@ namespace OpenSim.Region.Environment.Scenes SceneObjectPart part = GetChildPart(item.ParentPartID); if (part != null) { - part.UpdateInventoryItem(item); - + part.UpdateInventoryItem(item); + return true; } else @@ -266,55 +266,55 @@ namespace OpenSim.Region.Environment.Scenes "[PRIM INVENTORY]: " + "Couldn't find prim ID {0} to update item {1}, {2}", item.ParentPartID, item.Name, item.ItemID); - } - + } + return false; - } + } public int RemoveInventoryItem(uint localID, LLUUID itemID) { SceneObjectPart part = GetChildPart(localID); if (part != null) - { + { int type = part.RemoveInventoryItem(itemID); - + return type; } - + return -1; - } + } - public uint GetEffectivePermissions() - { - uint perms=(uint)(PermissionMask.Modify | - PermissionMask.Copy | - PermissionMask.Move | - PermissionMask.Transfer) | 7; + public uint GetEffectivePermissions() + { + uint perms=(uint)(PermissionMask.Modify | + PermissionMask.Copy | + PermissionMask.Move | + PermissionMask.Transfer) | 7; - foreach (SceneObjectPart part in m_parts.Values) - perms &= part.MaskEffectivePermissions(); + foreach (SceneObjectPart part in m_parts.Values) + perms &= part.MaskEffectivePermissions(); - if((RootPart.OwnerMask & (uint)PermissionMask.Modify) == 0) - perms &= ~(uint)PermissionMask.Modify; - if((RootPart.OwnerMask & (uint)PermissionMask.Copy) == 0) - perms &= ~(uint)PermissionMask.Copy; - if((RootPart.OwnerMask & (uint)PermissionMask.Transfer) == 0) - perms &= ~(uint)PermissionMask.Transfer; + if ((RootPart.OwnerMask & (uint)PermissionMask.Modify) == 0) + perms &= ~(uint)PermissionMask.Modify; + if ((RootPart.OwnerMask & (uint)PermissionMask.Copy) == 0) + perms &= ~(uint)PermissionMask.Copy; + if ((RootPart.OwnerMask & (uint)PermissionMask.Transfer) == 0) + perms &= ~(uint)PermissionMask.Transfer; - if((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0) - perms &= ~((uint)PermissionMask.Modify >> 13); - if((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0) - perms &= ~((uint)PermissionMask.Copy >> 13); - if((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0) - perms &= ~((uint)PermissionMask.Transfer >> 13); + if ((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0) + perms &= ~((uint)PermissionMask.Modify >> 13); + if ((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0) + perms &= ~((uint)PermissionMask.Copy >> 13); + if ((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0) + perms &= ~((uint)PermissionMask.Transfer >> 13); - return perms; - } + return perms; + } - public void ApplyNextOwnerPermissions() - { - foreach (SceneObjectPart part in m_parts.Values) - part.ApplyNextOwnerPermissions(); - } + public void ApplyNextOwnerPermissions() + { + foreach (SceneObjectPart part in m_parts.Values) + part.ApplyNextOwnerPermissions(); + } } } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 14bfde0..332d160 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -86,11 +86,11 @@ namespace OpenSim.Region.Environment.Scenes private PrimCountTaintedDelegate handlerPrimCountTainted = null; /// - /// Signal whether the non-inventory attributes of any prims in the group have changed + /// Signal whether the non-inventory attributes of any prims in the group have changed /// since the group's last persistent backup /// public bool HasGroupChanged = false; - + private LLVector3 lastPhysGroupPos; @@ -119,7 +119,7 @@ namespace OpenSim.Region.Environment.Scenes /// but not sure a object should have this /// as what does it tell us? that some avatar has selected it (but not what Avatar/user) /// think really there should be a list (or whatever) in each scenepresence - /// saying what prim(s) that user has selected. + /// saying what prim(s) that user has selected. /// protected bool m_isSelected = false; @@ -134,7 +134,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public int PrimCount { @@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public LLVector3 GroupCentrePoint { @@ -215,7 +215,7 @@ namespace OpenSim.Region.Environment.Scenes part.GroupPosition = val; } } - + //if (m_rootPart.PhysActor != null) //{ //m_rootPart.PhysActor.Position = @@ -225,7 +225,7 @@ namespace OpenSim.Region.Environment.Scenes //} } } - + public override uint LocalId { get @@ -316,17 +316,17 @@ namespace OpenSim.Region.Environment.Scenes #region Constructors /// - /// + /// /// public SceneObjectGroup() { } /// - /// This constructor creates a SceneObjectGroup using a pre-existing SceneObjectPart. - /// The original SceneObjectPart will be used rather than a copy, preserving + /// This constructor creates a SceneObjectGroup using a pre-existing SceneObjectPart. + /// The original SceneObjectPart will be used rather than a copy, preserving /// its existing localID and UUID. - /// + /// public SceneObjectGroup(Scene scene, ulong regionHandle, SceneObjectPart part) { m_scene = scene; @@ -416,7 +416,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public SceneObjectGroup(string xmlData) { @@ -464,7 +464,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, LLQuaternion rot, PrimitiveBaseShape shape) @@ -486,7 +486,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape) @@ -576,7 +576,7 @@ namespace OpenSim.Region.Environment.Scenes EntityIntersection inter = part.TestIntersectionOBB(hRay, parentrotation,frontFacesOnly, faceCenters); - // This may need to be updated to the maximum draw distance possible.. + // This may need to be updated to the maximum draw distance possible.. // We might (and probably will) be checking for prim creation from other sims // when the camera crosses the border. float idist = Constants.RegionSize; @@ -676,7 +676,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// private void SetPartAsRoot(SceneObjectPart part) @@ -693,7 +693,7 @@ namespace OpenSim.Region.Environment.Scenes DetachFromBackup(this); m_rootPart.m_attachedAvatar = agentID; - + if (m_rootPart.PhysActor != null) { m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor); @@ -753,7 +753,7 @@ namespace OpenSim.Region.Environment.Scenes AttachToBackup(); m_rootPart.ScheduleFullUpdate(); m_rootPart.ClearUndoState(); - + } public void DetachToInventoryPrep() { @@ -764,7 +764,7 @@ namespace OpenSim.Region.Environment.Scenes //detachedpos = avatar.AbsolutePosition; avatar.RemoveAttachment(this); } - + m_rootPart.m_attachedAvatar = LLUUID.Zero; m_rootPart.SetParentLocalId(0); //m_rootPart.SetAttachmentPoint((byte)0); @@ -773,10 +773,10 @@ namespace OpenSim.Region.Environment.Scenes //m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim); //AttachToBackup(); //m_rootPart.ScheduleFullUpdate(); - + } /// - /// + /// /// /// private void SetPartAsNonRoot(SceneObjectPart part) @@ -802,7 +802,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// Added as a way for the storage provider to reset the scene, + /// Added as a way for the storage provider to reset the scene, /// most likely a better way to do this sort of thing but for now... /// /// @@ -813,7 +813,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// public void AddPart(SceneObjectPart part) @@ -826,7 +826,7 @@ namespace OpenSim.Region.Environment.Scenes try { m_parts.Add(part.UUID, part); - + } catch (Exception e) { @@ -836,7 +836,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void UpdateParentIDs() { @@ -847,7 +847,7 @@ namespace OpenSim.Region.Environment.Scenes if (part.UUID != m_rootPart.UUID) { part.ParentID = m_rootPart.LocalId; - + } } } @@ -860,7 +860,7 @@ namespace OpenSim.Region.Environment.Scenes foreach (SceneObjectPart part in m_parts.Values) { part.UUID = LLUUID.Random(); - + } } } @@ -897,7 +897,7 @@ namespace OpenSim.Region.Environment.Scenes { SceneObjectPart part = GetChildPart(localId); OnGrabPart(part, offsetPos, remoteClient); - + } } @@ -905,7 +905,7 @@ namespace OpenSim.Region.Environment.Scenes { part.StoreUndoState(); part.OnGrab(offsetPos, remoteClient); - + } public virtual void OnGrabGroup(LLVector3 offsetPos, IClientAPI remoteClient) @@ -1068,7 +1068,7 @@ namespace OpenSim.Region.Environment.Scenes #region Events /// - /// + /// /// public void TriggerTainted() { @@ -1198,7 +1198,7 @@ namespace OpenSim.Region.Environment.Scenes dupe.RootPart.DoPhysicsPropertyUpdate(dupe.RootPart.PhysActor.IsPhysical, true); } - // Now we've made a copy that replaces this one, we need to + // Now we've made a copy that replaces this one, we need to // switch the owner to the person who did the copying // Second Life copies an object and duplicates the first one in it's place // So, we have to make a copy of this one, set it in it's place then set the owner on this one @@ -1227,7 +1227,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1359,7 +1359,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1373,14 +1373,14 @@ namespace OpenSim.Region.Environment.Scenes { m_parts.Add(newPart.UUID, newPart); } - + SetPartAsNonRoot(newPart); - + } /// /// Reset the LLUUIDs for all the prims that make up this group. - /// + /// /// This is called by methods which want to add a new group to an existing scene, in order /// to ensure that there are no clashes with groups already present. /// @@ -1398,7 +1398,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, LLUUID AgentID, uint RequestFlags) @@ -1425,7 +1425,7 @@ namespace OpenSim.Region.Environment.Scenes /// public override void Update() { - + lock (m_parts) { //if (m_rootPart.m_IsAttachment) @@ -1436,7 +1436,7 @@ namespace OpenSim.Region.Environment.Scenes //} //return; //} - + if (Util.GetDistanceTo(lastPhysGroupPos, AbsolutePosition) > 0.02) { m_rootPart.UpdateFlag = 1; @@ -1447,10 +1447,10 @@ namespace OpenSim.Region.Environment.Scenes //if (part.UpdateFlag == 0) part.UpdateFlag = 1; //} - - + + checkAtTargets(); - + if ((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1) || (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1) @@ -1508,7 +1508,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void ScheduleGroupForTerseUpdate() { @@ -1524,7 +1524,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void SendGroupFullUpdate() { @@ -1545,7 +1545,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void SendGroupTerseUpdate() { @@ -1669,7 +1669,7 @@ namespace OpenSim.Region.Environment.Scenes { if (objectGroup.RootPart.UpdateFlag > 0) { - // I've never actually seen this happen, though I think it's theoretically possible + // I've never actually seen this happen, though I think it's theoretically possible m_log.WarnFormat( "[SCENE OBJECT GROUP]: Aborted linking {0}, {1} to {2}, {3} as it has yet to finish delinking", objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID); @@ -1678,7 +1678,7 @@ namespace OpenSim.Region.Environment.Scenes } // m_log.DebugFormat( -// "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}", +// "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}", // objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID); SceneObjectPart linkPart = objectGroup.m_rootPart; @@ -1747,19 +1747,19 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// Delink the given prim from this group. The delinked prim is established as + /// Delink the given prim from this group. The delinked prim is established as /// an independent SceneObjectGroup. /// /// public void DelinkFromGroup(uint partID) { SceneObjectPart linkPart = GetChildPart(partID); - + if (null != linkPart) { linkPart.ClearUndoState(); // m_log.DebugFormat( -// "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}", +// "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}", // linkPart.Name, linkPart.UUID, RootPart.Name, RootPart.UUID); LLQuaternion worldRot = linkPart.GetWorldRotation(); @@ -1777,8 +1777,8 @@ namespace OpenSim.Region.Environment.Scenes m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor); } - // We need to reset the child part's position - // ready for life as a separate object after being a part of another object + // We need to reset the child part's position + // ready for life as a separate object after being a part of another object Quaternion parentRot = new Quaternion( m_rootPart.RotationOffset.W, @@ -1933,7 +1933,7 @@ namespace OpenSim.Region.Environment.Scenes m_rootPart.TouchName, new byte[0], m_rootPart.SitName, m_rootPart.Name, m_rootPart.Description, m_rootPart.OwnerMask, m_rootPart.NextOwnerMask, m_rootPart.GroupMask, m_rootPart.EveryoneMask, m_rootPart.BaseMask); - + } /// @@ -1998,13 +1998,13 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// /// /// - /// + /// public void UpdatePrimFlags(uint localID, ushort type, bool inUse, byte[] data) { SceneObjectPart part = GetChildPart(localID); @@ -2046,7 +2046,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2071,7 +2071,7 @@ namespace OpenSim.Region.Environment.Scenes #region Shape /// - /// + /// /// /// public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock, uint localID) @@ -2091,7 +2091,7 @@ namespace OpenSim.Region.Environment.Scenes #region Resize /// - /// + /// /// /// /// @@ -2169,7 +2169,7 @@ namespace OpenSim.Region.Environment.Scenes #region Position /// - /// + /// /// /// public void UpdateGroupPosition(LLVector3 pos) @@ -2189,7 +2189,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2210,7 +2210,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// private void UpdateRootPosition(LLVector3 pos) @@ -2255,7 +2255,7 @@ namespace OpenSim.Region.Environment.Scenes #region Rotation /// - /// + /// /// /// public void UpdateGroupRotation(LLQuaternion rot) @@ -2272,7 +2272,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2291,7 +2291,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -2312,7 +2312,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// private void UpdateRootRotation(LLQuaternion rot) @@ -2463,7 +2463,7 @@ namespace OpenSim.Region.Environment.Scenes // Reusing att.tolerance to hold the index of the target in the targets dictionary // to avoid deadlocking the sim. m_scene.TriggerAtTargetEvent(localids[ctr], (uint)att.tolerance, att.targetPos, m_rootPart.GroupPosition); - + } } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index e1be8ff..cce263c 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs @@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// Holds in memory prim inventory - /// + /// protected TaskInventoryDictionary m_taskInventory = new TaskInventoryDictionary(); public TaskInventoryDictionary TaskInventory @@ -84,21 +84,21 @@ namespace OpenSim.Region.Environment.Scenes /// /// Reset LLUUIDs for all the items in the prim's inventory. This involves either generating /// new ones or setting existing UUIDs to the correct parent UUIDs. - /// + /// /// If this method is called and there are inventory items, then we regard the inventory as having changed. /// /// Link number for the part public void ResetInventoryIDs() { lock (TaskInventory) - { + { if (0 == TaskInventory.Count) { - return; + return; } - - HasInventoryChanged = true; - + + HasInventoryChanged = true; + IList items = new List(TaskInventory.Values); TaskInventory.Clear(); @@ -127,7 +127,7 @@ namespace OpenSim.Region.Environment.Scenes if (ownerId != item.OwnerID) { item.LastOwnerID = item.OwnerID; - item.OwnerID = ownerId; + item.OwnerID = ownerId; } } } @@ -178,7 +178,7 @@ namespace OpenSim.Region.Environment.Scenes { // m_log.InfoFormat( // "[PRIM INVENTORY]: " + - // "Starting script {0}, {1} in prim {2}, {3}", + // "Starting script {0}, {1} in prim {2}, {3}", // item.Name, item.ItemID, Name, UUID); AddFlag(LLObject.ObjectFlags.Scripted); @@ -211,7 +211,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// /// A - /// + /// public void StartScript(LLUUID itemId) { lock (m_taskInventory) @@ -234,7 +234,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// Stop a script which is in this prim's inventory. /// - /// + /// public void StopScript(LLUUID itemId) { if (m_taskInventory.ContainsKey(itemId)) @@ -306,9 +306,9 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// Restore a whole collection of items to the prim's inventory at once. + /// Restore a whole collection of items to the prim's inventory at once. /// We assume that the items already have all their fields correctly filled out. - /// The items are not flagged for persistence to the database, since they are being restored + /// The items are not flagged for persistence to the database, since they are being restored /// from persistence rather than being newly added. /// /// @@ -338,9 +338,9 @@ namespace OpenSim.Region.Environment.Scenes if (m_taskInventory.ContainsKey(itemID)) { // m_log.DebugFormat( -// "[PRIM INVENTORY]: Retrieved task inventory item {0}, {1} from prim {2}, {3}", +// "[PRIM INVENTORY]: Retrieved task inventory item {0}, {1} from prim {2}, {3}", // m_taskInventory[itemID].Name, itemID, Name, UUID); - + return m_taskInventory[itemID]; } else @@ -450,11 +450,11 @@ namespace OpenSim.Region.Environment.Scenes /// /// public bool GetInventoryFileName(IClientAPI client, uint localID) - { + { // m_log.DebugFormat( // "[PRIM INVENTORY]: Received request from client {0} for inventory file name of {1}, {2}", // client.AgentId, Name, UUID); - + if (m_inventorySerial > 0) { client.SendTaskInventory(m_uuid, (short)m_inventorySerial, @@ -473,9 +473,9 @@ namespace OpenSim.Region.Environment.Scenes /// /// public void RequestInventoryFile(IXfer xferManager) - { + { byte[] fileData = new byte[0]; - + // Confusingly, the folder item has to be the object id, while the 'parent id' has to be zero. This matches // what appears to happen in the Second Life protocol. If this isn't the case. then various functionality // isn't available (such as drag from prim inventory to agent inventory) @@ -486,39 +486,39 @@ namespace OpenSim.Region.Environment.Scenes foreach (TaskInventoryItem item in m_taskInventory.Values) { invString.AddItemStart(); - invString.AddNameValueLine("item_id", item.ItemID.ToString()); + invString.AddNameValueLine("item_id", item.ItemID.ToString()); invString.AddNameValueLine("parent_id", UUID.ToString()); invString.AddPermissionsStart(); - - invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(item.BaseMask)); - invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(item.OwnerMask)); + + invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(item.BaseMask)); + invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(item.OwnerMask)); invString.AddNameValueLine("group_mask", "00000000"); invString.AddNameValueLine("everyone_mask", "00000000"); invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextOwnerMask)); - + invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); invString.AddNameValueLine("owner_id", item.OwnerID.ToString()); - + invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString()); // invString.AddNameValueLine("last_owner_id", item.OwnerID.ToString()); - + invString.AddNameValueLine("group_id", item.GroupID.ToString()); invString.AddSectionEnd(); - + invString.AddNameValueLine("asset_id", item.AssetID.ToString()); invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); invString.AddNameValueLine("flags", "00000000"); - + invString.AddSaleStart(); invString.AddNameValueLine("sale_type", "not"); invString.AddNameValueLine("sale_price", "0"); invString.AddSectionEnd(); - + invString.AddNameValueLine("name", item.Name + "|"); invString.AddNameValueLine("desc", item.Description + "|"); - + invString.AddNameValueLine("creation_date", item.CreationDate.ToString()); invString.AddSectionEnd(); } @@ -576,13 +576,13 @@ namespace OpenSim.Region.Environment.Scenes BuildString += "\tpermissions 0\n"; AddSectionStart(); } - + public void AddSaleStart() { BuildString += "\tsale_info\t0\n"; AddSectionStart(); - } - + } + protected void AddSectionStart() { BuildString += "\t{\n"; @@ -610,64 +610,64 @@ namespace OpenSim.Region.Environment.Scenes } } - public uint MaskEffectivePermissions() - { - uint mask=0x7fffffff; - - foreach (TaskInventoryItem item in m_taskInventory.Values) - { - if(item.InvType != 6) - { - if((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Copy) == 0) - mask &= ~((uint)PermissionMask.Copy >> 13); - if((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Transfer) == 0) - mask &= ~((uint)PermissionMask.Transfer >> 13); - if((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Modify) == 0) - mask &= ~((uint)PermissionMask.Modify >> 13); - } - else - { - if((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0) - mask &= ~((uint)PermissionMask.Copy >> 13); - if((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0) - mask &= ~((uint)PermissionMask.Transfer >> 13); - if((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0) - mask &= ~((uint)PermissionMask.Modify >> 13); - } - - if((item.OwnerMask & (uint)PermissionMask.Copy) == 0) - mask &= ~(uint)PermissionMask.Copy; - if((item.OwnerMask & (uint)PermissionMask.Transfer) == 0) - mask &= ~(uint)PermissionMask.Transfer; - if((item.OwnerMask & (uint)PermissionMask.Modify) == 0) - mask &= ~(uint)PermissionMask.Modify; - } - return mask; - } - - public void ApplyNextOwnerPermissions() - { - BaseMask &= NextOwnerMask; - OwnerMask &= NextOwnerMask; - EveryoneMask &= NextOwnerMask; - - foreach (TaskInventoryItem item in m_taskInventory.Values) - { - if(item.InvType == 6) - { - if((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0) - item.OwnerMask &= ~(uint)PermissionMask.Copy; - if((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0) - item.OwnerMask &= ~(uint)PermissionMask.Transfer; - if((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0) - item.OwnerMask &= ~(uint)PermissionMask.Modify; - } - item.OwnerMask &= item.NextOwnerMask; - item.BaseMask &= item.NextOwnerMask; - item.EveryoneMask &= item.NextOwnerMask; - } - - TriggerScriptChangedEvent(Changed.OWNER); - } + public uint MaskEffectivePermissions() + { + uint mask=0x7fffffff; + + foreach (TaskInventoryItem item in m_taskInventory.Values) + { + if (item.InvType != 6) + { + if ((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Copy) == 0) + mask &= ~((uint)PermissionMask.Copy >> 13); + if ((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Transfer) == 0) + mask &= ~((uint)PermissionMask.Transfer >> 13); + if ((item.OwnerMask & item.NextOwnerMask & (uint)PermissionMask.Modify) == 0) + mask &= ~((uint)PermissionMask.Modify >> 13); + } + else + { + if ((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0) + mask &= ~((uint)PermissionMask.Copy >> 13); + if ((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0) + mask &= ~((uint)PermissionMask.Transfer >> 13); + if ((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0) + mask &= ~((uint)PermissionMask.Modify >> 13); + } + + if ((item.OwnerMask & (uint)PermissionMask.Copy) == 0) + mask &= ~(uint)PermissionMask.Copy; + if ((item.OwnerMask & (uint)PermissionMask.Transfer) == 0) + mask &= ~(uint)PermissionMask.Transfer; + if ((item.OwnerMask & (uint)PermissionMask.Modify) == 0) + mask &= ~(uint)PermissionMask.Modify; + } + return mask; + } + + public void ApplyNextOwnerPermissions() + { + BaseMask &= NextOwnerMask; + OwnerMask &= NextOwnerMask; + EveryoneMask &= NextOwnerMask; + + foreach (TaskInventoryItem item in m_taskInventory.Values) + { + if (item.InvType == 6) + { + if ((item.OwnerMask & ((uint)PermissionMask.Copy >> 13)) == 0) + item.OwnerMask &= ~(uint)PermissionMask.Copy; + if ((item.OwnerMask & ((uint)PermissionMask.Transfer >> 13)) == 0) + item.OwnerMask &= ~(uint)PermissionMask.Transfer; + if ((item.OwnerMask & ((uint)PermissionMask.Modify >> 13)) == 0) + item.OwnerMask &= ~(uint)PermissionMask.Modify; + } + item.OwnerMask &= item.NextOwnerMask; + item.BaseMask &= item.NextOwnerMask; + item.EveryoneMask &= item.NextOwnerMask; + } + + TriggerScriptChangedEvent(Changed.OWNER); + } } } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 0196b91..a52d5f9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -41,7 +41,7 @@ using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.Environment.Scenes { - // I don't really know where to put this except here. + // I don't really know where to put this except here. // Can't access the OpenSim.Region.ScriptEngine.Common.LSL_BaseClass.Changed constants [Flags] public enum ExtraParamType @@ -81,13 +81,13 @@ namespace OpenSim.Region.Environment.Scenes SCALE = 0x40 } - + [Serializable] public partial class SceneObjectPart : IScriptHost, ISerializable { [XmlIgnore] public PhysicsActor PhysActor = null; - + public LLUUID LastOwnerID; public LLUUID OwnerID; public LLUUID GroupID; @@ -95,7 +95,7 @@ namespace OpenSim.Region.Environment.Scenes public byte ObjectSaleType; public int SalePrice; public uint Category; - + // TODO: This needs to be persisted in next XML version update! [XmlIgnore] public int[] PayPrice = {-2,-2,-2,-2,-2}; [XmlIgnore] private Dictionary m_scriptEvents = new Dictionary(); @@ -139,7 +139,7 @@ namespace OpenSim.Region.Environment.Scenes set { Flags = (LLObject.ObjectFlags)value; } } - #endregion + #endregion protected byte[] m_particleSystem = new byte[0]; @@ -152,13 +152,13 @@ namespace OpenSim.Region.Environment.Scenes /// 0 - no update is scheduled /// 1 - terse update scheduled /// 2 - full update scheduled - /// + /// /// TODO - This should be an enumeration /// private byte m_updateFlag; #region Properties - + public LLUUID CreatorID; public LLUUID ObjectCreator @@ -230,7 +230,7 @@ namespace OpenSim.Region.Environment.Scenes /// A Linked Child Prim objects position in world public LLVector3 GetWorldPosition() { - + Quaternion parentRot = new Quaternion( ParentGroup.RootPart.RotationOffset.W, ParentGroup.RootPart.RotationOffset.X, @@ -256,13 +256,13 @@ namespace OpenSim.Region.Environment.Scenes /// public LLQuaternion GetWorldRotation() { - + Quaternion newRot; - + if (this.LinkNum == 0) { newRot = new Quaternion(RotationOffset.W,RotationOffset.X,RotationOffset.Y,RotationOffset.Z); - + } else { @@ -286,7 +286,7 @@ namespace OpenSim.Region.Environment.Scenes //return new LLQuaternion(axiomPartRotation.x, axiomPartRotation.y, axiomPartRotation.z, axiomPartRotation.w); } - + public void StoreUndoState() { if (!m_undoing) @@ -307,7 +307,7 @@ namespace OpenSim.Region.Environment.Scenes if (m_parentGroup.GetSceneMaxUndo() > 0) { UndoState nUndo = new UndoState(this); - + m_undo.Push(nUndo); } @@ -362,7 +362,7 @@ namespace OpenSim.Region.Environment.Scenes } else { - + // To move the child prim in respect to the group position and rotation we have to calculate LLVector3 resultingposition = GetWorldPosition(); @@ -370,7 +370,7 @@ namespace OpenSim.Region.Environment.Scenes LLQuaternion resultingrot = GetWorldRotation(); PhysActor.Orientation = new Quaternion(resultingrot.W, resultingrot.X, resultingrot.Y, resultingrot.Z); } - + // Tell the physics engines that this prim changed. m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); } @@ -379,12 +379,12 @@ namespace OpenSim.Region.Environment.Scenes Console.WriteLine(e.Message); } } - + } } private byte[] m_TextureAnimation; - + protected LLVector3 m_offsetPosition; public LLVector3 OffsetPosition @@ -398,7 +398,7 @@ namespace OpenSim.Region.Environment.Scenes { // Hack to get the child prim to update world positions in the physics engine ParentGroup.ResetChildPrimPhysicsPositions(); - + } catch (NullReferenceException) { @@ -467,7 +467,7 @@ namespace OpenSim.Region.Environment.Scenes Console.WriteLine(ex.Message); } } - + } } @@ -494,8 +494,8 @@ namespace OpenSim.Region.Environment.Scenes return m_velocity; } - set { - + set { + m_velocity = value; if (PhysActor != null) { @@ -505,7 +505,7 @@ namespace OpenSim.Region.Environment.Scenes m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); } } - + } } @@ -565,7 +565,7 @@ namespace OpenSim.Region.Environment.Scenes { m_color = value; TriggerScriptChangedEvent(Changed.COLOR); - + /* ScheduleFullUpdate() need not be called b/c after * setting the color, the text will be set, so then * ScheduleFullUpdate() will be called. */ @@ -615,11 +615,11 @@ namespace OpenSim.Region.Environment.Scenes public int LinkNum { get { return m_linkNum; } - set - { + set + { m_linkNum = value; TriggerScriptChangedEvent(Changed.LINK); - + } } @@ -646,7 +646,7 @@ namespace OpenSim.Region.Environment.Scenes public void ApplyImpulse(LLVector3 impulsei, bool localGlobalTF) { PhysicsVector impulse = new PhysicsVector(impulsei.X, impulsei.Y, impulsei.Z); - + if (localGlobalTF) { @@ -659,7 +659,7 @@ namespace OpenSim.Region.Environment.Scenes } else { - + if (m_parentGroup != null) { m_parentGroup.applyImpulse(impulse); @@ -698,9 +698,9 @@ namespace OpenSim.Region.Environment.Scenes public PrimitiveBaseShape Shape { get { return m_shape; } - set + set { - + m_shape = value; TriggerScriptChangedEvent(Changed.SHAPE); } @@ -709,7 +709,7 @@ namespace OpenSim.Region.Environment.Scenes public LLVector3 Scale { get { return m_shape.Scale; } - set + set { StoreUndoState(); m_shape.Scale = value; @@ -731,7 +731,7 @@ namespace OpenSim.Region.Environment.Scenes } #endregion - + public LLUUID ObjectOwner { get { return OwnerID; } @@ -809,9 +809,9 @@ namespace OpenSim.Region.Environment.Scenes Acceleration = new LLVector3(0, 0, 0); m_TextureAnimation = new byte[0]; m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; - + // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, - // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from + // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log Flags = 0; @@ -819,7 +819,7 @@ namespace OpenSim.Region.Environment.Scenes TrimPermissions(); //m_undo = new UndoStack(ParentGroup.GetSceneMaxUndo()); - + ScheduleFullUpdate(); } @@ -855,14 +855,14 @@ namespace OpenSim.Region.Environment.Scenes OffsetPosition = position; RotationOffset = rotation; ObjectFlags = flags; - + // Since we don't store script state, this is only a 'temporary' objectflag now // If the object is scripted, the script will get loaded and this will be set again - ObjectFlags &= ~(uint)(LLObject.ObjectFlags.Scripted | LLObject.ObjectFlags.Touch); - + ObjectFlags &= ~(uint)(LLObject.ObjectFlags.Scripted | LLObject.ObjectFlags.Touch); + TrimPermissions(); // ApplyPhysics(); - + ScheduleFullUpdate(); } @@ -881,7 +881,7 @@ namespace OpenSim.Region.Environment.Scenes SceneObjectPart newobject = (SceneObjectPart) serializer.Deserialize(xmlReader); return newobject; } - + public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim) { @@ -902,7 +902,7 @@ namespace OpenSim.Region.Environment.Scenes new PhysicsVector(Scale.X, Scale.Y, Scale.Z), new Quaternion(RotationOffset.W, RotationOffset.X, RotationOffset.Y, RotationOffset.Z), RigidBody); - + // Basic Physics returns null.. joy joy joy. if (PhysActor != null) { @@ -954,7 +954,7 @@ namespace OpenSim.Region.Environment.Scenes Vector3 rOrigin = iray.Origin; Vector3 rDirection = iray.Direction; - + //rDirection = rDirection.Normalize(); // Buidling the first part of the Quadratic equation @@ -985,7 +985,7 @@ namespace OpenSim.Region.Environment.Scenes radius = vScale.z; // the second part of this is the default prim size - // once we factor in the aabb of the prim we're adding we can + // once we factor in the aabb of the prim we're adding we can // change this to; // radius = (radius / 2) - 0.01f; // @@ -1018,7 +1018,7 @@ namespace OpenSim.Region.Environment.Scenes } } - // We got an intersection. putting together an EntityIntersection object with the + // We got an intersection. putting together an EntityIntersection object with the // intersection information Vector3 ipoint = new Vector3(iray.Origin.x + (iray.Direction.x*root), iray.Origin.y + (iray.Direction.y*root), @@ -1089,16 +1089,16 @@ namespace OpenSim.Region.Environment.Scenes Vector3 AXpos = new Vector3(pos.X, pos.Y, pos.Z); // tScale is the offset to derive the vertex based on the scale. - // it's different for each vertex because we've got to rotate it + // it's different for each vertex because we've got to rotate it // to get the world position of the vertex to produce the Oriented Bounding Box - Vector3 tScale = new Vector3(); + Vector3 tScale = new Vector3(); Vector3 AXscale = new Vector3(m_shape.Scale.X * 0.5f, m_shape.Scale.Y * 0.5f, m_shape.Scale.Z * 0.5f); //Vector3 pScale = (AXscale) - (AXrot.Inverse() * (AXscale)); //Vector3 nScale = (AXscale * -1) - (AXrot.Inverse() * (AXscale * -1)); - + // rScale is the rotated offset to find a vertex based on the scale and the world rotation. Vector3 rScale = new Vector3(); @@ -1109,14 +1109,14 @@ namespace OpenSim.Region.Environment.Scenes // | | // | 4 top | // |_________| - // C D - + // C D + // A _________ B // | Back | // | 3 | // |_________| - // C D - + // C D + // A _________ B B _________ A // | Left | | Right | // | 0 | | 2 | @@ -1127,13 +1127,13 @@ namespace OpenSim.Region.Environment.Scenes // | Front | // | 1 | // |_________| - // C D + // C D // C _________ D // | | // | 5 bot | // |_________| - // A B + // A B #endregion #region Plane Decomposition of Oriented Bounding Box @@ -1238,22 +1238,22 @@ namespace OpenSim.Region.Environment.Scenes for (int i = 0; i < 6; i++) { //m_log.Info("[FACECALCULATION]: FaceA[" + i + "]=" + FaceA[i] + " FaceB[" + i + "]=" + FaceB[i] + " FaceC[" + i + "]=" + FaceC[i] + " FaceD[" + i + "]=" + FaceD[i]); - + // Our Plane direction AmBa = FaceA[i] - FaceB[i]; AmBb = FaceB[i] - FaceC[i]; - + cross = AmBb.Cross(AmBa); // normalize the cross product to get the normal. - normals[i] = cross / cross.Length; - + normals[i] = cross / cross.Length; + //m_log.Info("[NORMALS]: normals[ " + i + "]" + normals[i].ToString()); //distance[i] = (normals[i].x * AmBa.x + normals[i].y * AmBa.y + normals[i].z * AmBa.z) * -1; } EntityIntersection returnresult = new EntityIntersection(); - + returnresult.distance = 1024; float c = 0; float a = 0; @@ -1276,7 +1276,7 @@ namespace OpenSim.Region.Environment.Scenes //{ //return returnresult; //} - // else + // else //{ //continue; //} @@ -1294,9 +1294,9 @@ namespace OpenSim.Region.Environment.Scenes //} //} - //else + //else //{ - //if (a < fmin) + //if (a < fmin) //{ //if (a < 0 || a < fmax) //{ @@ -1339,7 +1339,7 @@ namespace OpenSim.Region.Environment.Scenes // If the normal is pointing outside the object - + if (iray.Direction.Dot(normals[i]) < 0 || !frontFacesOnly) { @@ -1359,7 +1359,7 @@ namespace OpenSim.Region.Environment.Scenes { distance2 = (float)GetDistanceTo(q, iray.Origin); } - + if (distance2 < returnresult.distance) { @@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Environment.Scenes } return returnresult; } - + // Use this for attachments! LocalID should be avatar's localid public void SetParentLocalId(uint localID) { @@ -1388,16 +1388,16 @@ namespace OpenSim.Region.Environment.Scenes public void SetAttachmentPoint(uint AttachmentPoint) { m_attachmentPoint = AttachmentPoint; - + // save the attachment point. //if (AttachmentPoint != 0) //{ m_shape.State = (byte)AttachmentPoint; //} - + } /// - /// + /// /// public void SetParent(SceneObjectGroup parent) { @@ -1417,7 +1417,7 @@ namespace OpenSim.Region.Environment.Scenes PhysActor.Buoyancy = fvalue; } } - + public void SetAxisRotation(int axis, int rotate) { if (m_parentGroup != null) @@ -1448,7 +1448,7 @@ namespace OpenSim.Region.Environment.Scenes } } - + public LLVector3 GetSitTargetPositionLL() { @@ -1547,9 +1547,9 @@ namespace OpenSim.Region.Environment.Scenes dupe.ObjectSaleType = ObjectSaleType; dupe.SalePrice = SalePrice; dupe.Category = Category; - + dupe.TaskInventory = (TaskInventoryDictionary)dupe.TaskInventory.Clone(); - + dupe.ResetIDs(linkNum); // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. @@ -1569,7 +1569,7 @@ namespace OpenSim.Region.Environment.Scenes } #endregion - + /// /// Reset LLUUIDs for this part. This involves generate this part's own LLUUID and /// generating new LLUUIDs for all the items in the inventory. @@ -1578,8 +1578,8 @@ namespace OpenSim.Region.Environment.Scenes public void ResetIDs(int linkNum) { UUID = LLUUID.Random(); - LinkNum = linkNum; - + LinkNum = linkNum; + ResetInventoryIDs(); } @@ -1603,9 +1603,9 @@ namespace OpenSim.Region.Environment.Scenes m_parentGroup.HasGroupChanged = true; m_parentGroup.QueueForUpdateCheck(); } - + int timeNow = Util.UnixTimeSinceEpoch(); - + // If multiple updates are scheduled on the same second, we still need to perform all of them // So we'll force the issue by bumping up the timestamp so that later processing sees these need // to be performed. @@ -1617,11 +1617,11 @@ namespace OpenSim.Region.Environment.Scenes { TimeStampFull = (uint)timeNow; } - + m_updateFlag = 2; - + // m_log.DebugFormat( -// "[SCENE OBJECT PART]: Scheduling full update for {0}, {1} at {2}", +// "[SCENE OBJECT PART]: Scheduling full update for {0}, {1} at {2}", // UUID, Name, TimeStampFull); } @@ -1668,13 +1668,13 @@ namespace OpenSim.Region.Environment.Scenes m_updateFlag = 1; // m_log.DebugFormat( -// "[SCENE OBJECT PART]: Scheduling terse update for {0}, {1} at {2}", +// "[SCENE OBJECT PART]: Scheduling terse update for {0}, {1} at {2}", // UUID, Name, TimeStampTerse); } } /// - /// Tell all the prims which have had updates scheduled + /// Tell all the prims which have had updates scheduled /// public void SendScheduledUpdates() { @@ -1687,7 +1687,7 @@ namespace OpenSim.Region.Environment.Scenes // bad, so it's been replaced by an event driven method. //if ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) != 0) //{ - // Only send the constant terse updates on physical objects! + // Only send the constant terse updates on physical objects! //ScheduleTerseUpdate(); //} } @@ -1706,7 +1706,7 @@ namespace OpenSim.Region.Environment.Scenes #region Shape /// - /// + /// /// /// public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock) @@ -1750,7 +1750,7 @@ namespace OpenSim.Region.Environment.Scenes //m_log.Info("TSomething4:" + ((type & (ushort)ExtraParamType.Something4) == (ushort)ExtraParamType.Something4)); //m_log.Info("TSomething5:" + ((type & (ushort)ExtraParamType.Something5) == (ushort)ExtraParamType.Something5)); //m_log.Info("TSomething6:" + ((type & (ushort)ExtraParamType.Something6) == (ushort)ExtraParamType.Something6)); - + bool usePhysics = false; bool IsTemporary = false; bool IsPhantom = false; @@ -1758,7 +1758,7 @@ namespace OpenSim.Region.Environment.Scenes bool wasUsingPhysics = ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) != 0); //bool IsLocked = false; int i = 0; - + try { @@ -1975,7 +1975,7 @@ namespace OpenSim.Region.Environment.Scenes #region Texture /// - /// + /// /// /// public void UpdateTextureEntry(byte[] textureEntry) @@ -1985,7 +1985,7 @@ namespace OpenSim.Region.Environment.Scenes ScheduleFullUpdate(); } - // Added to handle bug in libsecondlife's TextureEntry.ToBytes() + // Added to handle bug in libsecondlife's TextureEntry.ToBytes() // not handling RGBA properly. Cycles through, and "fixes" the color // info public void UpdateTexture(LLObject.TextureEntry tex) @@ -2030,7 +2030,7 @@ namespace OpenSim.Region.Environment.Scenes byte[] data = new byte[16]; int pos = 0; - // The flags don't like conversion from uint to byte, so we have to do + // The flags don't like conversion from uint to byte, so we have to do // it the crappy way. See the above function :( data[pos] = ConvertScriptUintToByte(pTexAnim.Flags); pos++; @@ -2059,7 +2059,7 @@ namespace OpenSim.Region.Environment.Scenes #region Position /// - /// + /// /// /// public void UpdateOffSet(LLVector3 pos) @@ -2115,7 +2115,7 @@ namespace OpenSim.Region.Environment.Scenes foreach (ScenePresence p in avatarts) { // TODO: some filtering by distance of avatar - + p.ControllingClient.SendPreLoadSound(objectID, objectID, soundID); } } @@ -2193,14 +2193,14 @@ namespace OpenSim.Region.Environment.Scenes #region Resizing/Scale /// - /// + /// /// /// public void Resize(LLVector3 scale) { StoreUndoState(); m_shape.Scale = scale; - + ScheduleFullUpdate(); } @@ -2261,7 +2261,7 @@ namespace OpenSim.Region.Environment.Scenes } #region Client Update Methods - + /// /// Tell all scene presences that they should send updates for this part to their clients /// @@ -2287,7 +2287,7 @@ namespace OpenSim.Region.Environment.Scenes } } } - + public void AddFullUpdateToAvatar(ScenePresence presence) { @@ -2295,7 +2295,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void SendFullUpdateToAllClients() { @@ -2309,7 +2309,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags) @@ -2328,7 +2328,7 @@ namespace OpenSim.Region.Environment.Scenes lPos = OffsetPosition; SendFullUpdateToClient(remoteClient, lPos, clientflags); } - + /// /// Sends a full update to the client /// @@ -2338,7 +2338,7 @@ namespace OpenSim.Region.Environment.Scenes public void SendFullUpdateToClient(IClientAPI remoteClient, LLVector3 lPos, uint clientFlags) { clientFlags &= ~(uint) LLObject.ObjectFlags.CreateSelected; - + if (remoteClient.AgentId == OwnerID) { if ((uint) (Flags & LLObject.ObjectFlags.CreateSelected) != 0) @@ -2351,7 +2351,7 @@ namespace OpenSim.Region.Environment.Scenes byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; remoteClient.SendPrimitiveToClient( - m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, + m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, OwnerID, m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, m_attachmentPoint,fromAssetID); @@ -2373,7 +2373,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void SendTerseUpdateToAllClients() { @@ -2451,7 +2451,7 @@ namespace OpenSim.Region.Environment.Scenes m_parentGroup.AbsolutePosition = newpos; return; } - + } ScheduleTerseUpdate(); diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 28507cd..ba8bbd9 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -40,7 +40,7 @@ using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.Environment.Scenes { - enum ScriptControlled : int + enum ScriptControlled : int { CONTROL_ZERO = 0, CONTROL_FWD = 1, @@ -63,14 +63,14 @@ namespace OpenSim.Region.Environment.Scenes public ScriptControlled eventControls; } - [Serializable] + [Serializable] public class ScenePresence : EntityBase, ISerializable { // ~ScenePresence() // { // System.Console.WriteLine("[ScenePresence] Destructor called"); // } - + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public static byte[] DefaultTexture; @@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Scenes private LLVector3 m_requestedSitOffset = new LLVector3(); private float m_sitAvatarHeight = 2.0f; private float m_godlevel = 0; - + private bool m_invulnerable = true; private LLVector3 m_LastChildAgentUpdatePosition = new LLVector3(); @@ -114,7 +114,7 @@ namespace OpenSim.Region.Environment.Scenes private float m_health = 100f; private LLVector3 m_lastVelocity = LLVector3.Zero; - + // Default AV Height private float m_avHeight = 127.0f; @@ -213,10 +213,10 @@ namespace OpenSim.Region.Environment.Scenes get { return m_invulnerable; } } - public float GodLevel - { - get { return m_godlevel; } - } + public float GodLevel + { + get { return m_godlevel; } + } private readonly ulong m_regionHandle; @@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// This works out to be the ClientView object associated with this avatar, or it's client connection manager /// - private IClientAPI m_controllingClient; + private IClientAPI m_controllingClient; protected PhysicsActor m_physicsActor; @@ -350,7 +350,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// If this is true, agent doesn't have a representation in this scene. /// this is an agent 'looking into' this scene from a nearby scene(region) - /// + /// /// if False, this agent has a representation in this scene /// private bool m_isChildAgent = true; @@ -482,7 +482,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// Send updates to the client about prims which have been placed on the update queue. We don't + /// Send updates to the client about prims which have been placed on the update queue. We don't /// necessarily send updates for all the parts on the queue, e.g. if an updates with a more recent /// timestamp has already been sent. /// @@ -498,12 +498,12 @@ namespace OpenSim.Region.Environment.Scenes if (!m_gotAllObjectsInScene) { if (!m_isChildAgent || m_scene.m_seeIntoRegionFromNeighbor) - { + { m_scene.SendAllSceneObjectsToClient(this); - m_gotAllObjectsInScene = true; + m_gotAllObjectsInScene = true; } } - + if (m_partsUpdateQueue.Count > 0) { bool runUpdate = true; @@ -520,12 +520,12 @@ namespace OpenSim.Region.Environment.Scenes if (update.LastFullUpdateTime < part.TimeStampFull) { // m_log.DebugFormat( -// "[SCENE PRESENCE]: Fully updating prim {0}, {1} - part timestamp {2}", +// "[SCENE PRESENCE]: Fully updating prim {0}, {1} - part timestamp {2}", // part.Name, part.UUID, part.TimeStampFull); - + part.SendFullUpdate(ControllingClient, GenerateClientFlags(part.UUID)); - // We'll update to the part's timestamp rather than the current time to + // We'll update to the part's timestamp rather than the current time to // avoid the race condition whereby the next tick occurs while we are // doing this update. If this happened, then subsequent updates which occurred // on the same tick or the next tick of the last update would be ignored. @@ -536,9 +536,9 @@ namespace OpenSim.Region.Environment.Scenes else if (update.LastTerseUpdateTime <= part.TimeStampTerse) { // m_log.DebugFormat( -// "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}", +// "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}", // part.Name, part.UUID, part.TimeStampTerse); - + part.SendTerseUpdate(ControllingClient); update.LastTerseUpdateTime = part.TimeStampTerse; @@ -575,15 +575,15 @@ namespace OpenSim.Region.Environment.Scenes /// /// This turns a child agent, into a root agent - /// This is called when an agent teleports into a region, or if an + /// This is called when an agent teleports into a region, or if an /// agent crosses into this region from a neighbor over the border /// public void MakeRootAgent(LLVector3 pos, bool isFlying) { // m_log.DebugFormat( -// "[SCENEPRESENCE]: Upgrading child agent {0}, {1} to a root agent in {2}", +// "[SCENEPRESENCE]: Upgrading child agent {0}, {1} to a root agent in {2}", // Name, UUID, m_scene.RegionInfo.RegionName); - + m_isChildAgent = false; AbsolutePosition = pos; @@ -599,7 +599,7 @@ namespace OpenSim.Region.Environment.Scenes //{ m_scene.SendAllSceneObjectsToClient(this); m_scene.LandChannel.SendLandUpdate(this, true); - + //m_gotAllObjectsInScene = true; //} } @@ -607,8 +607,8 @@ namespace OpenSim.Region.Environment.Scenes /// /// This turns a root agent into a child agent /// when an agent departs this region for a neighbor, this gets called. - /// - /// It doesn't get called for a teleport. Reason being, an agent that + /// + /// It doesn't get called for a teleport. Reason being, an agent that /// teleports out may not be anywhere near this region /// public void MakeChildAgent() @@ -616,15 +616,15 @@ namespace OpenSim.Region.Environment.Scenes m_animations.Clear(); // m_log.DebugFormat( -// "[SCENEPRESENCE]: Downgrading child agent {0}, {1} to a root agent in {2}", +// "[SCENEPRESENCE]: Downgrading child agent {0}, {1} to a root agent in {2}", // Name, UUID, m_scene.RegionInfo.RegionName); - + Velocity = new LLVector3(0, 0, 0); m_isChildAgent = true; m_scene.SwapRootAgentCount(true); RemoveFromPhysicalScene(); m_scene.EventManager.TriggerOnMakeChildAgent(this); - //this.Pos = new LLVector3(128, 128, 70); + //this.Pos = new LLVector3(128, 128, 70); } /// @@ -643,7 +643,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// public void Teleport(LLVector3 pos) @@ -656,7 +656,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void StopMovement() { @@ -762,7 +762,7 @@ namespace OpenSim.Region.Environment.Scenes uint flags = agentData.ControlFlags; LLQuaternion bodyRotation = agentData.BodyRotation; - // Camera location in world. We'll need to raytrace + // Camera location in world. We'll need to raytrace // from this location from time to time. m_CameraCenter.x = agentData.CameraCenter.X; m_CameraCenter.y = agentData.CameraCenter.Y; @@ -815,7 +815,7 @@ namespace OpenSim.Region.Environment.Scenes // m_AgentControlFlags = flags; // m_headrotation = agentData.AgentData.HeadRotation; // m_state = agentData.AgentData.State; - + if (m_allowMovement) { int i = 0; @@ -870,7 +870,7 @@ namespace OpenSim.Region.Environment.Scenes i++; } } - // Cause the avatar to stop flying if it's colliding + // Cause the avatar to stop flying if it's colliding // with something with the down arrow pressed. // Skip if there's no physicsactor @@ -886,7 +886,7 @@ namespace OpenSim.Region.Environment.Scenes // Are the collision requirements fulfilled? bool colliding = (m_physicsActor.IsColliding == true); - + if (m_physicsActor.Flying && colliding && controlland) { @@ -903,9 +903,9 @@ namespace OpenSim.Region.Environment.Scenes UpdateMovementAnimations(); } } - + m_scene.EventManager.TriggerOnClientMovement(this); - + m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); } @@ -934,7 +934,7 @@ namespace OpenSim.Region.Environment.Scenes m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); m_parentPosition = new LLVector3(); - + m_parentID = 0; SendFullUpdateToAllClients(); @@ -949,10 +949,10 @@ namespace OpenSim.Region.Environment.Scenes private void SendSitResponse(IClientAPI remoteClient, LLUUID targetID, LLVector3 offset) { - - - + + + bool autopilot = true; LLVector3 pos = new LLVector3(); LLQuaternion sitOrientation = new LLQuaternion(0, 0, 0, 1); @@ -1008,10 +1008,10 @@ namespace OpenSim.Region.Environment.Scenes } ControllingClient.SendSitResponse(targetID, offset, sitOrientation, autopilot, LLVector3.Zero, LLVector3.Zero, false); - - // This calls HandleAgentSit twice, once from here, and the client calls + + // This calls HandleAgentSit twice, once from here, and the client calls // HandleAgentSit itself after it gets to the location - // It doesn't get to the location until we've moved them there though + // It doesn't get to the location until we've moved them there though // which happens in HandleAgentSit :P if (!autopilot) HandleAgentSit(remoteClient, UUID); @@ -1256,7 +1256,7 @@ namespace OpenSim.Region.Environment.Scenes } m_perfMonMS = System.Environment.TickCount; - + m_rotation = rotation; NewForce newVelocity = new NewForce(); Vector3 direc = rotation*vec; @@ -1268,9 +1268,9 @@ namespace OpenSim.Region.Environment.Scenes direc *= 4; //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)); //bool colliding = (m_physicsActor.IsColliding==true); - //if (controlland) + //if (controlland) // m_log.Info("[AGENT]: landCommand"); - //if (colliding) + //if (colliding) // m_log.Info("[AGENT]: colliding"); //if (m_physicsActor.Flying && colliding && controlland) //{ @@ -1306,7 +1306,7 @@ namespace OpenSim.Region.Environment.Scenes #region Overridden Methods /// - /// + /// /// public override void Update() { @@ -1383,7 +1383,7 @@ namespace OpenSim.Region.Environment.Scenes lastPhysPos = AbsolutePosition; m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); - + } public void SendCoarseLocations() @@ -1433,7 +1433,7 @@ namespace OpenSim.Region.Environment.Scenes foreach (ScenePresence avatar in avatars) { SendFullUpdateToOtherClient(avatar); - + if (avatar.LocalId != LocalId) { if (!avatar.m_isChildAgent || m_scene.m_seeIntoRegionFromNeighbor) @@ -1448,7 +1448,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void SendInitialData() { @@ -1472,7 +1472,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// public void SendOwnAppearance() @@ -1481,7 +1481,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void SendAppearanceToAllOtherAgents() { @@ -1498,7 +1498,7 @@ namespace OpenSim.Region.Environment.Scenes } public void SendAppearanceToOtherAgent(ScenePresence avatar) - { + { avatar.ControllingClient.SendAppearance( m_appearance.Owner, m_appearance.VisualParams, @@ -1522,7 +1522,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// /// /// @@ -1536,7 +1536,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// /// public void SendAnimPack() { @@ -1568,7 +1568,7 @@ namespace OpenSim.Region.Environment.Scenes } // Minimum Draw distance is 64 meters, the Radius of the draw distance sphere is 32m - if (Util.GetDistanceTo(AbsolutePosition,m_LastChildAgentUpdatePosition) > 32) + if (Util.GetDistanceTo(AbsolutePosition,m_LastChildAgentUpdatePosition) > 32) { ChildAgentDataUpdate cadu = new ChildAgentDataUpdate(); cadu.ActiveGroupID=LLUUID.Zero.UUID; @@ -1593,14 +1593,14 @@ namespace OpenSim.Region.Environment.Scenes multiplier = 0.25f; } - //m_log.Info("[NeighborThrottle]: " + m_scene.GetInaccurateNeighborCount().ToString() + " - m: " + multiplier.ToString()); + //m_log.Info("[NeighborThrottle]: " + m_scene.GetInaccurateNeighborCount().ToString() + " - m: " + multiplier.ToString()); cadu.throttles = ControllingClient.GetThrottlesPacked(multiplier); - - - - cadu.Velocity = new sLLVector3(Velocity); + + + + cadu.Velocity = new sLLVector3(Velocity); m_scene.SendOutChildAgentUpdates(cadu,this); m_LastChildAgentUpdatePosition.X = AbsolutePosition.X; m_LastChildAgentUpdatePosition.Y = AbsolutePosition.Y; @@ -1681,9 +1681,9 @@ namespace OpenSim.Region.Environment.Scenes ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle); if (neighbourRegion != null) - { + { // When the neighbour is informed of the border crossing, it will set up CAPS handlers for the avatar - // This means we need to remove the current caps handler here and possibly compensate later, + // This means we need to remove the current caps handler here and possibly compensate later, // in case both scenes are being hosted on the same region server. Messy m_scene.RemoveCapsHandler(UUID); newpos = newpos + (vel); @@ -1691,17 +1691,17 @@ namespace OpenSim.Region.Environment.Scenes m_scene.InformNeighbourOfCrossing(neighbourHandle, m_controllingClient.AgentId, newpos, m_physicsActor.Flying); if (res) - { + { AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo(); - // TODO Should construct this behind a method - string capsPath = + // TODO Should construct this behind a method + string capsPath = "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort + "/CAPS/" + circuitdata.CapsPath + "0000/"; - + m_log.DebugFormat( - "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid); - + "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid); + m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, capsPath); MakeChildAgent(); @@ -1742,17 +1742,17 @@ namespace OpenSim.Region.Environment.Scenes /// public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY) { - // + // int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize; int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize; - + m_DrawDistance = cAgentData.drawdistance; m_pos = new LLVector3(cAgentData.Position.x + shiftx, cAgentData.Position.y + shifty, cAgentData.Position.z); // It's hard to say here.. We can't really tell where the camera position is unless it's in world cordinates from the sending region m_CameraCenter = new Vector3(cAgentData.cameraPosition.x, cAgentData.cameraPosition.y, cAgentData.cameraPosition.z); - + m_godlevel = cAgentData.godlevel; SetHeight(cAgentData.AVHeight); @@ -1793,8 +1793,8 @@ namespace OpenSim.Region.Environment.Scenes } catch (NullReferenceException) { - // Under extreme load, this returns a NullReference Exception that we can ignore. - // Ignoring this causes no movement to be sent to the physics engine... + // Under extreme load, this returns a NullReference Exception that we can ignore. + // Ignoring this causes no movement to be sent to the physics engine... // which when the scene is moving at 1 frame every 10 seconds, it doesn't really matter! } m_newForce = true; @@ -1809,12 +1809,12 @@ namespace OpenSim.Region.Environment.Scenes static ScenePresence() { - + LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); DefaultTexture = textu.ToBytes(); } - [Serializable] + [Serializable] public class NewForce { public float X; @@ -1826,8 +1826,8 @@ namespace OpenSim.Region.Environment.Scenes } } - [Serializable] - public class ScenePartUpdate : ISerializable + [Serializable] + public class ScenePartUpdate : ISerializable { public LLUUID FullID; public uint LastFullUpdateTime; @@ -1883,7 +1883,7 @@ namespace OpenSim.Region.Environment.Scenes public void AddToPhysicalScene() { PhysicsScene scene = m_scene.PhysicsScene; - + PhysicsVector pVec = new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z); @@ -1936,7 +1936,7 @@ namespace OpenSim.Region.Environment.Scenes if (m_health <= 0) m_scene.EventManager.TriggerAvatarKill(killerObj, this); } - + if (Velocity.X > 0 || Velocity.Y > 0) UpdateMovementAnimations(); } @@ -2161,7 +2161,7 @@ namespace OpenSim.Region.Environment.Scenes // m_partsUpdateQueue = (UpdateQueue)info.GetValue("m_partsUpdateQueue", typeof(UpdateQueue)); /* - Dictionary updateTimes_work + Dictionary updateTimes_work = (Dictionary)info.GetValue("m_updateTimes", typeof(Dictionary)); foreach (Guid id in updateTimes_work.Keys) @@ -2188,7 +2188,7 @@ namespace OpenSim.Region.Environment.Scenes (float)info.GetValue("lastKnownAllowedPosition.X", typeof(float)), (float)info.GetValue("lastKnownAllowedPosition.Y", typeof(float)), (float)info.GetValue("lastKnownAllowedPosition.Z", typeof(float))); - + sentMessageAboutRestrictedParcelFlyingDown = (bool)info.GetValue("sentMessageAboutRestrictedParcelFlyingDown", typeof(bool)); m_LastChildAgentUpdatePosition @@ -2196,7 +2196,7 @@ namespace OpenSim.Region.Environment.Scenes (float)info.GetValue("m_LastChildAgentUpdatePosition.X", typeof(float)), (float)info.GetValue("m_LastChildAgentUpdatePosition.Y", typeof(float)), (float)info.GetValue("m_LastChildAgentUpdatePosition.Z", typeof(float))); - + m_perfMonMS = (int)info.GetValue("m_perfMonMS", typeof(int)); m_AgentControlFlags = (uint)info.GetValue("m_AgentControlFlags", typeof(uint)); @@ -2246,7 +2246,7 @@ namespace OpenSim.Region.Environment.Scenes info.AddValue("m_sitAvatarHeight", m_sitAvatarHeight); info.AddValue("m_godlevel", m_godlevel); info.AddValue("m_setAlwaysRun", m_setAlwaysRun); - + // Quaternion info.AddValue("m_bodyRot.w", m_bodyRot.w); info.AddValue("m_bodyRot.x", m_bodyRot.x); @@ -2374,7 +2374,7 @@ namespace OpenSim.Region.Environment.Scenes public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, LLUUID Script_item_LLUUID) { - + ScriptControllers obj = new ScriptControllers(); obj.ignoreControls = ScriptControlled.CONTROL_ZERO; obj.eventControls = ScriptControlled.CONTROL_ZERO; @@ -2386,7 +2386,7 @@ namespace OpenSim.Region.Environment.Scenes IgnoredControls |= (ScriptControlled)controls; obj.ignoreControls = (ScriptControlled)controls; } - + if (pass_on == 0 && accept == 1) { IgnoredControls |= (ScriptControlled)controls; @@ -2432,7 +2432,7 @@ namespace OpenSim.Region.Environment.Scenes lock (scriptedcontrols) { scriptedcontrols.Clear(); - } + } ControllingClient.SendTakeControls(int.MaxValue, false, false); } @@ -2454,7 +2454,7 @@ namespace OpenSim.Region.Environment.Scenes internal void SendControlToScripts(uint flags, ScriptControlled lastFlags) { - + ScriptControlled allflags = ScriptControlled.CONTROL_ZERO; if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0 || (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) != 0) @@ -2497,10 +2497,10 @@ namespace OpenSim.Region.Environment.Scenes { allflags |= ScriptControlled.CONTROL_LBUTTON; } - + ScriptControlled held = ScriptControlled.CONTROL_ZERO; ScriptControlled change = ScriptControlled.CONTROL_ZERO; - + foreach (ScriptControlled DCF in Enum.GetValues(typeof (ScriptControlled))) { // Held @@ -2539,7 +2539,7 @@ namespace OpenSim.Region.Environment.Scenes } } LastCommands = allflags; - + } internal uint RemoveIgnoredControls(uint flags, ScriptControlled Ignored) { diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs index 8390f64..7d048a3 100644 --- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs @@ -70,7 +70,7 @@ namespace OpenSim.Region.Environment.Scenes obj.ResetIDs(); } //if we want this to be a import method then we need new uuids for the object to avoid any clashes - //obj.RegenerateFullIDs(); + //obj.RegenerateFullIDs(); m_innerScene.AddEntity(obj); SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); @@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes { XmlDocument doc = new XmlDocument(); XmlNode rootNode; - + XmlTextReader reader = new XmlTextReader(new StringReader(xmlString)); reader.WhitespaceHandling = WhitespaceHandling.None; doc.Load(reader); @@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes { CreatePrimFromXml(aPrimNode.OuterXml); } - + } public void LoadPrimsFromXml2(string fileName) @@ -206,7 +206,7 @@ namespace OpenSim.Region.Environment.Scenes rootPart.PhysActor.LocalID = rootPart.LocalId; rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); } - rootPart.Velocity = receivedVelocity; + rootPart.Velocity = receivedVelocity; } obj.ScheduleGroupForFullUpdate(); diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs index a150164..90a971f 100644 --- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs @@ -97,12 +97,12 @@ namespace OpenSim.Region.Environment.Scenes private int m_scriptLinesPerSecond = 0; private int objectCapacity = 45000; - + SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[21]; SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock(); SimStatsPacket statpack = (SimStatsPacket)PacketPool.Instance.GetPacket(PacketType.SimStats); - + private RegionInfo ReportingRegion; @@ -138,8 +138,8 @@ namespace OpenSim.Region.Environment.Scenes lock (m_report) { // Packet is already initialized and ready for data insert - - + + statpack.Region = rb; statpack.Region.RegionX = ReportingRegion.RegionLocX; statpack.Region.RegionY = ReportingRegion.RegionLocY; @@ -152,99 +152,99 @@ namespace OpenSim.Region.Environment.Scenes statpack.Region.RegionFlags = (uint) 0; } statpack.Region.ObjectCapacity = (uint) objectCapacity; - + #region various statistic googly moogly - + // Our FPS is actually 10fps, so multiplying by 5 to get the amount that people expect there // 0-50 is pretty close to 0-45 float simfps = (int) ((m_fps * 5)); - + //if (simfps > 45) //simfps = simfps - (simfps - 45); //if (simfps < 0) //simfps = 0; - + // float physfps = ((m_pfps / 1000)); - + //if (physfps > 600) //physfps = physfps - (physfps - 600); - + if (physfps < 0) physfps = 0; - + #endregion - - //Our time dilation is 0.91 when we're running a full speed, - // therefore to make sure we get an appropriate range, - // we have to factor in our error. (0.10f * statsUpdateFactor) + + //Our time dilation is 0.91 when we're running a full speed, + // therefore to make sure we get an appropriate range, + // we have to factor in our error. (0.10f * statsUpdateFactor) // multiplies the fix for the error times the amount of times it'll occur a second // / 10 divides the value by the number of times the sim heartbeat runs (10fps) // Then we divide the whole amount by the amount of seconds pass in between stats updates. - + sb[0].StatID = (uint) Stats.TimeDilation; sb[0].StatValue = m_timeDilation ; //((((m_timeDilation + (0.10f * statsUpdateFactor)) /10) / statsUpdateFactor)); - + sb[1].StatID = (uint) Stats.SimFPS; sb[1].StatValue = simfps/statsUpdateFactor; - + sb[2].StatID = (uint) Stats.PhysicsFPS; sb[2].StatValue = physfps / statsUpdateFactor; - + sb[3].StatID = (uint) Stats.AgentUpdates; sb[3].StatValue = (m_agentUpdates / statsUpdateFactor); - + sb[4].StatID = (uint) Stats.Agents; sb[4].StatValue = m_rootAgents; - + sb[5].StatID = (uint) Stats.ChildAgents; sb[5].StatValue = m_childAgents; - + sb[6].StatID = (uint) Stats.TotalPrim; sb[6].StatValue = m_numPrim; - + sb[7].StatID = (uint) Stats.ActivePrim; sb[7].StatValue = m_activePrim; - + sb[8].StatID = (uint)Stats.FrameMS; sb[8].StatValue = m_frameMS / statsUpdateFactor; - + sb[9].StatID = (uint)Stats.NetMS; sb[9].StatValue = m_netMS / statsUpdateFactor; - + sb[10].StatID = (uint)Stats.PhysicsMS; sb[10].StatValue = m_physicsMS / statsUpdateFactor; - + sb[11].StatID = (uint)Stats.ImageMS ; sb[11].StatValue = m_imageMS / statsUpdateFactor; - + sb[12].StatID = (uint)Stats.OtherMS; sb[12].StatValue = m_otherMS / statsUpdateFactor; - + sb[13].StatID = (uint)Stats.InPacketsPerSecond; sb[13].StatValue = (m_inPacketsPerSecond); - + sb[14].StatID = (uint)Stats.OutPacketsPerSecond; sb[14].StatValue = (m_outPacketsPerSecond / statsUpdateFactor); - + sb[15].StatID = (uint)Stats.UnAckedBytes; sb[15].StatValue = m_unAckedBytes; - + sb[16].StatID = (uint)Stats.AgentMS; sb[16].StatValue = m_agentMS / statsUpdateFactor; - + sb[17].StatID = (uint)Stats.PendingDownloads; sb[17].StatValue = m_pendingDownloads; - + sb[18].StatID = (uint)Stats.PendingUploads; sb[18].StatValue = m_pendingUploads; - + sb[19].StatID = (uint)Stats.ActiveScripts; sb[19].StatValue = m_activeScripts; - + sb[20].StatID = (uint)Stats.ScriptLinesPerSecond; sb[20].StatValue = m_scriptLinesPerSecond / statsUpdateFactor; - + statpack.Stat = sb; handlerSendStatResult = OnSendStatsResult; @@ -255,7 +255,7 @@ namespace OpenSim.Region.Environment.Scenes resetvalues(); } } - + private void resetvalues() { m_timeDilation = 0; @@ -274,13 +274,13 @@ namespace OpenSim.Region.Environment.Scenes m_imageMS = 0; m_otherMS = 0; -//Ckrinke This variable is not used, so comment to remove compiler warning until it is used. +//Ckrinke This variable is not used, so comment to remove compiler warning until it is used. //Ckrinke m_scriptMS = 0; } # region methods called from Scene // The majority of these functions are additive - // so that you can easily change the amount of + // so that you can easily change the amount of // seconds in between sim stats updates public void AddTimeDilation(float td) @@ -368,14 +368,14 @@ namespace OpenSim.Region.Environment.Scenes { m_otherMS += ms; } - -// private static readonly log4net.ILog m_log + +// private static readonly log4net.ILog m_log // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - + public void addPendingDownload(int count) { m_pendingDownloads += count; - //m_log.InfoFormat("[stats]: Adding {0} to pending downloads to make {1}", count, m_pendingDownloads); + //m_log.InfoFormat("[stats]: Adding {0} to pending downloads to make {1}", count, m_pendingDownloads); } public void addScriptLines(int count) diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Environment/Types/UpdateQueue.cs index ec1ffd2..e9133ac 100644 --- a/OpenSim/Region/Environment/Types/UpdateQueue.cs +++ b/OpenSim/Region/Environment/Types/UpdateQueue.cs @@ -34,8 +34,8 @@ using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Types { - [Serializable] - public class UpdateQueue : ISerializable + [Serializable] + public class UpdateQueue : ISerializable { private Queue m_queue; diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 6087857..78b5d1f 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -292,7 +292,7 @@ namespace OpenSim.Region.Examples.SimpleModule return new byte[0]; } - + public virtual void SendAnimations(LLUUID[] animations, int[] seqs, LLUUID sourceAgentId) { } @@ -311,12 +311,12 @@ namespace OpenSim.Region.Examples.SimpleModule LLUUID imSessionID, string fromName, byte dialog, uint timeStamp) { } - + public virtual void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, LLUUID imSessionID, string fromName, byte dialog, uint timeStamp, byte[] binaryBucket) { - } + } public virtual void SendLayerData(float[] map) { @@ -396,7 +396,7 @@ namespace OpenSim.Region.Examples.SimpleModule } public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, - PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, + PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, @@ -404,7 +404,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, - PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, + PrimitiveBaseShape primShape, LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, @@ -443,10 +443,10 @@ namespace OpenSim.Region.Examples.SimpleModule public virtual void SendRemoveInventoryItem(LLUUID itemID) { } - + /// IClientAPI.SendBulkUpdateInventory(InventoryItemBase) - public virtual void SendBulkUpdateInventory(InventoryItemBase item) - { + public virtual void SendBulkUpdateInventory(InventoryItemBase item) + { } public LLUUID GetDefaultAnimation(string name) @@ -550,7 +550,7 @@ namespace OpenSim.Region.Examples.SimpleModule public void SendObjectPropertiesFamilyData(uint RequestFlags, LLUUID ObjectUUID, LLUUID OwnerID, LLUUID GroupID, uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, - uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category, + uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category, LLUUID LastOwnerID, string ObjectName, string Description) { } diff --git a/OpenSim/Region/Examples/SimpleModule/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleModule/Properties/AssemblyInfo.cs index e0e8fd9..4c0c0a0 100644 --- a/OpenSim/Region/Examples/SimpleModule/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Examples/SimpleModule/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OpenSim.Region.Examples.SimpleModule")] @@ -40,8 +40,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -51,11 +51,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index 4c933d6..bac2252 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs @@ -101,7 +101,7 @@ namespace OpenSim.Region.Modules.AvatarFactory else { // BUG: !? (Reduced from 5000 to 500 by Adam) - Thread.Sleep(500); //why is this here? + Thread.Sleep(500); //why is this here? //this is the first thread to request this appearance //so let it check the db and if not found then create a default appearance @@ -279,7 +279,7 @@ namespace OpenSim.Region.Modules.AvatarFactory { if (profile.RootFolder != null) { - + foreach (AvatarWearingArgs.Wearable wear in e.NowWearing) { if (wear.Type < 13) @@ -292,9 +292,9 @@ namespace OpenSim.Region.Modules.AvatarFactory else { LLUUID assetId; - + InventoryItemBase baseItem = profile.RootFolder.FindItem(wear.ItemID); - + if (baseItem != null) { assetId = baseItem.AssetID; diff --git a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs index a9fe53e..640b0b0 100644 --- a/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Modules/AvatarFactory/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OpenSim.Region.Modules.AvatarFactory")] @@ -40,8 +40,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -51,11 +51,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs index 0839267..a54ddda 100644 --- a/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Python")] @@ -14,8 +14,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,11 +25,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs index c9f8423..165fcea 100644 --- a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("SvnSerialiser")] @@ -40,8 +40,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -51,11 +51,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 9415fff..5ced2d1 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs @@ -282,9 +282,9 @@ namespace OpenSim.Region.Physics.BulletXPlugin bool needsCollision;// = base.NeedsCollision(bodyA, bodyB); int c1 = 3; int c2 = 3; - + //////////////////////////////////////////////////////// - //BulletX Mesh Collisions + //BulletX Mesh Collisions //added by Jed zhu //data: May 07,2005 //////////////////////////////////////////////////////// @@ -302,9 +302,9 @@ namespace OpenSim.Region.Physics.BulletXPlugin else needsCollision = base.NeedsCollision(bodyA, bodyB); - + #endregion - + //m_log.DebugFormat("[BulletX]: A collision was detected between {0} and {1} --> {2}", nameA, nameB, //needsCollision); @@ -705,7 +705,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin } foreach (BulletXPrim prim in _prims.Values) { - //_height = HeightValue(prim.RigidBodyPosition); + //_height = HeightValue(prim.RigidBodyPosition); _height = _simFlatPlanet.HeightValue(prim.RigidBodyPosition); prim.ValidateHeight(_height); //if (_simFlatPlanet.heightIsNotValid(prim.RigidBodyPosition, out _height)) prim.ValidateHeight(_height); @@ -741,8 +741,8 @@ namespace OpenSim.Region.Physics.BulletXPlugin public override bool IsThreaded { - get - { + get + { return (false); // for now we won't be multithreaded } } @@ -1380,17 +1380,17 @@ namespace OpenSim.Region.Physics.BulletXPlugin /// public class BulletXPrim : BulletXActor { - //Density it will depends of material. + //Density it will depends of material. //For now all prims have the same density, all prims are made of water. Be water my friend! :D private const float _density = 1000.0f; private BulletXScene _parent_scene; private PhysicsVector m_prev_position = new PhysicsVector(0, 0, 0); private bool m_lastUpdateSent = false; - //added by jed zhu + //added by jed zhu private IMesh _mesh; public IMesh GetMesh() { return _mesh; } - + public BulletXPrim(String primName, BulletXScene parent_scene, PhysicsVector pos, PhysicsVector size, AxiomQuaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool isPhysical) diff --git a/OpenSim/Region/Physics/BulletXPlugin/TriangleIndexVertexArray.cs b/OpenSim/Region/Physics/BulletXPlugin/TriangleIndexVertexArray.cs index 0902077..637cf6e 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/TriangleIndexVertexArray.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/TriangleIndexVertexArray.cs @@ -20,8 +20,8 @@ */ /* - This file contains a class TriangleIndexVertexArray. I tried using the class with the same name - from the BulletX implementation and found it unusable for the purpose of using triangle meshes + This file contains a class TriangleIndexVertexArray. I tried using the class with the same name + from the BulletX implementation and found it unusable for the purpose of using triangle meshes within BulletX as the implementation was painfully incomplete. The attempt to derive from the original class failed as viable members were hidden. Fiddling around with BulletX itself was not my intention. diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index c1dc91b..3cf2646 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs @@ -140,7 +140,7 @@ namespace OpenSim.Region.Physics.Manager // a race condition if the last subscriber unsubscribes // immediately after the null check and before the event is raised. RequestTerseUpdate handler = OnRequestTerseUpdate; - + if (handler != null) { handler(); @@ -163,9 +163,9 @@ namespace OpenSim.Region.Physics.Manager public virtual void SendCollisionUpdate(EventArgs e) { CollisionUpdate handler = OnCollisionUpdate; - + if (handler != null) - { + { handler(e); } } @@ -205,9 +205,9 @@ namespace OpenSim.Region.Physics.Manager public class NullPhysicsActor : PhysicsActor { - public override bool Stopped - { - get{ return false; } + public override bool Stopped + { + get{ return false; } } public override PhysicsVector Position @@ -222,7 +222,7 @@ namespace OpenSim.Region.Physics.Manager set { return; } } - public override uint LocalID + public override uint LocalID { set { return; } } @@ -240,14 +240,14 @@ namespace OpenSim.Region.Physics.Manager public override float Buoyancy { get { return 0f; } - set { return; } + set { return; } } public override bool FloatOnWater { set { return; } } - + public override bool CollidingGround { get { return false; } @@ -297,7 +297,7 @@ namespace OpenSim.Region.Physics.Manager set { return; } } - public override float CollisionScore + public override float CollisionScore { get { return 0f; } } @@ -385,7 +385,7 @@ namespace OpenSim.Region.Physics.Manager public override void SubscribeEvents(int ms) { - + } public override void UnSubscribeEvents() { diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index b8ca180..6a71581 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs @@ -94,7 +94,7 @@ namespace OpenSim.Region.Physics.Manager _MeshPlugins.Add(plugHard.GetName(), plugHard); m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); - // And now walk all assemblies (DLLs effectively) and see if they are home + // And now walk all assemblies (DLLs effectively) and see if they are home // of a plugin that is of interest for us string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics"); string[] pluginFiles = Directory.GetFiles(path, "*.dll"); @@ -108,11 +108,11 @@ namespace OpenSim.Region.Physics.Manager private void AddPlugin(string FileName) { // TODO / NOTE - // The assembly named 'OpenSim.Region.Physics.BasicPhysicsPlugin' was loaded from + // The assembly named 'OpenSim.Region.Physics.BasicPhysicsPlugin' was loaded from // 'file:///C:/OpenSim/trunk2/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll' // using the LoadFrom context. The use of this context can result in unexpected behavior - // for serialization, casting and dependency resolution. In almost all cases, it is recommended - // that the LoadFrom context be avoided. This can be done by installing assemblies in the + // for serialization, casting and dependency resolution. In almost all cases, it is recommended + // that the LoadFrom context be avoided. This can be done by installing assemblies in the // Global Assembly Cache or in the ApplicationBase directory and using Assembly. // Load when explicitly loading assemblies. Assembly pluginAssembly = Assembly.LoadFrom(FileName); diff --git a/OpenSim/Region/Physics/Manager/PhysicsSensor.cs b/OpenSim/Region/Physics/Manager/PhysicsSensor.cs index ce53108..add741b 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsSensor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsSensor.cs @@ -35,7 +35,7 @@ namespace OpenSim.Region.Physics.Manager { NONE = 0, AGENT = 1, - ACTIVE = 2, + ACTIVE = 2, PASSIVE = 3, SCRIPTED = 4 } diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs index b98cb35..b759213 100644 --- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs +++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs @@ -31,9 +31,9 @@ using OpenSim.Framework; /* * This is the zero mesher. * Whatever you want him to mesh, he can't, telling you that by responding with a null pointer. - * Effectivly this is for switching off meshing and for testing as each physics machine should deal + * Effectivly this is for switching off meshing and for testing as each physics machine should deal * with the null pointer situation. - * But it's also a convenience thing, as physics machines can rely on having a mesher in any situation, even + * But it's also a convenience thing, as physics machines can rely on having a mesher in any situation, even * if it's a dump one like this. * Note, that this mesher is *not* living in a module but in the manager itself, so * it's always availabe and thus the default in case of configuration errors diff --git a/OpenSim/Region/Physics/Meshing/HelperTypes.cs b/OpenSim/Region/Physics/Meshing/HelperTypes.cs index efc5968..584133c 100644 --- a/OpenSim/Region/Physics/Meshing/HelperTypes.cs +++ b/OpenSim/Region/Physics/Meshing/HelperTypes.cs @@ -49,7 +49,7 @@ public class Quaternion } public Quaternion(Vertex axis, float angle) { - // using (* 0.5) instead of (/2) + // using (* 0.5) instead of (/2) w = (float)Math.Cos(angle * 0.5f); x = axis.X * (float)Math.Sin(angle * 0.5f); y = axis.Y * (float)Math.Sin(angle * 0.5f); @@ -65,8 +65,8 @@ public class Quaternion c.w = a.w * b.w - a.x * b.x - a.y * b.y - a.z * b.z; return c; } - - + + public Matrix4 computeMatrix() { return new Matrix4(this); @@ -74,7 +74,7 @@ public class Quaternion public void normalize() { float mag = length(); - + w /= mag; x /= mag; y /= mag; @@ -367,7 +367,7 @@ public class Triangle // It is assumed, that the triangles vertices are already set correctly double p1x, p2x, p1y, p2y, p3x, p3y; - // Deviation of this routine: + // Deviation of this routine: // A circle has the general equation (M-p)^2=r^2, where M and p are vectors // this gives us three equations f(p)=r^2, each for one point p1, p2, p3 // putting respectively two equations together gives two equations @@ -378,7 +378,7 @@ public class Triangle // Now using the equations that are formed by the components of the vectors // and isolate Mx lets you make one equation that only holds My // The rest is straight forward and eaasy :-) - // + // /* helping variables for temporary results */ double c1, c2; @@ -496,7 +496,7 @@ public class Triangle v2 = vt; } - // Dumps a triangle in the "raw faces" format, blender can import. This is for visualisation and + // Dumps a triangle in the "raw faces" format, blender can import. This is for visualisation and // debugging purposes public String ToStringRaw() { diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 2e7ec15..4bf12c9 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.Physics.Meshing for (iCurrentVertex = usedForSeed; iCurrentVertex < iMaxVertex; iCurrentVertex++) { // Background: A triangle mesh fulfills the delaunay condition if (iff!) - // each circumlocutory circle (i.e. the circle that touches all three corners) + // each circumlocutory circle (i.e. the circle that touches all three corners) // of each triangle is empty of other vertices. // Obviously a single (seeding) triangle fulfills this condition. // If we now add one vertex, we need to reconstruct all triangles, that @@ -132,7 +132,7 @@ namespace OpenSim.Region.Physics.Meshing // Reconstruction phase. First step, dissolve each triangle into it's simplices, // i.e. it's "border lines" // Goal is to find "inner" borders and delete them, while the hull gets conserved. - // Inner borders are special in the way that they always come twice, which is how we detect them + // Inner borders are special in the way that they always come twice, which is how we detect them foreach (Triangle t in influencedTriangles) { List newSimplices = t.GetSimplices(); @@ -142,8 +142,8 @@ namespace OpenSim.Region.Physics.Meshing // Now sort the simplices. That will make identical ones reside side by side in the list simplices.Sort(); - // Look for duplicate simplices here. - // Remember, they are directly side by side in the list right now, + // Look for duplicate simplices here. + // Remember, they are directly side by side in the list right now, // So we only check directly neighbours int iSimplex; List innerSimplices = new List(); @@ -162,7 +162,7 @@ namespace OpenSim.Region.Physics.Meshing } // each simplex still in the list belongs to the hull of the region in question - // The new vertex (yes, we still deal with verices here :-)) forms a triangle + // The new vertex (yes, we still deal with verices here :-)) forms a triangle // with each of these simplices. Build the new triangles and add them to the list foreach (Simplex s in simplices) { @@ -206,14 +206,14 @@ namespace OpenSim.Region.Physics.Meshing } break; - + default: if (hshape == HollowShape.Same) hshape= HollowShape.Square; break; } - + SimpleHull holeHull = null; if (hshape == HollowShape.Square) @@ -428,13 +428,13 @@ namespace OpenSim.Region.Physics.Meshing UInt16 pathShearY = primShape.PathShearY; Int16 twistTop = primShape.PathTwistBegin; Int16 twistBot = primShape.PathTwist; - + //m_log.Error("pathShear:" + primShape.PathShearX.ToString() + "," + primShape.PathShearY.ToString()); //m_log.Error("pathTaper:" + primShape.PathTaperX.ToString() + "," + primShape.PathTaperY.ToString()); //m_log.Error("ProfileBegin:" + primShape.ProfileBegin.ToString() + "," + primShape.ProfileBegin.ToString()); //m_log.Error("PathScale:" + primShape.PathScaleX.ToString() + "," + primShape.PathScaleY.ToString()); - + // Procedure: This is based on the fact that the upper (plus) and lower (minus) Z-surface // of a block are basically the same // They may be warped differently but the shape is identical @@ -469,7 +469,7 @@ namespace OpenSim.Region.Physics.Meshing if (fProfileBeginAngle < fProfileEndAngle) fProfileEndAngle -= 360.0; - // Note, that we don't want to cut out a triangle, even if this is a + // Note, that we don't want to cut out a triangle, even if this is a // good approximation for small cuts. Indeed we want to cut out an arc // and we approximate this arc by a polygon chain // Also note, that these vectors are of length 1.0 and thus their endpoints lay outside the model space @@ -559,7 +559,7 @@ namespace OpenSim.Region.Physics.Meshing extr.taperBotFactorX = 1.0f - ((100 - (float)taperX) / 100); //m_log.Warn("taperBotFactorX: " + extr.taperBotFactorX.ToString()); } - + } if (taperY != 100) @@ -575,8 +575,8 @@ namespace OpenSim.Region.Physics.Meshing //m_log.Warn("taperBotFactorY: " + extr.taperBotFactorY.ToString()); } } - - + + if (pathShearX != 0) { if (pathShearX > 50) @@ -585,7 +585,7 @@ namespace OpenSim.Region.Physics.Meshing extr.pushX = (((float)(256 - pathShearX) / 100) * -1f); // m_log.Warn("pushX: " + extr.pushX); } - else + else { extr.pushX = (float)pathShearX / 100; // m_log.Warn("pushX: " + extr.pushX); @@ -600,7 +600,7 @@ namespace OpenSim.Region.Physics.Meshing extr.pushY = (((float)(256 - pathShearY) / 100) * -1f); //m_log.Warn("pushY: " + extr.pushY); } - else + else { extr.pushY = (float)pathShearY / 100; //m_log.Warn("pushY: " + extr.pushY); @@ -615,7 +615,7 @@ namespace OpenSim.Region.Physics.Meshing extr.twistTop = 360 - (-1 * extr.twistTop); } - + extr.twistTop = (float)(extr.twistTop * DEG_TO_RAD); } @@ -660,7 +660,7 @@ namespace OpenSim.Region.Physics.Meshing UInt16 pathShearY = primShape.PathShearY; Int16 twistBot = primShape.PathTwist; Int16 twistTop = primShape.PathTwistBegin; - + // Procedure: This is based on the fact that the upper (plus) and lower (minus) Z-surface // of a block are basically the same @@ -715,7 +715,7 @@ namespace OpenSim.Region.Physics.Meshing //Vertex Q1Q12 = new Vertex(-0.46f, -0.18f, 0.0f); //Vertex Q1Q13 = new Vertex(-0.43f, -0.24f, 0.0f); //Vertex Q1Q14 = new Vertex(-0.40f, -0.30f, 0.0f); - + SimpleHull outerHull = new SimpleHull(); //Clockwise around the quadrants //outerHull.AddVertex(Q1Q15); @@ -803,7 +803,7 @@ namespace OpenSim.Region.Physics.Meshing if (fProfileBeginAngle < fProfileEndAngle) fProfileEndAngle -= 360.0; - // Note, that we don't want to cut out a triangle, even if this is a + // Note, that we don't want to cut out a triangle, even if this is a // good approximation for small cuts. Indeed we want to cut out an arc // and we approximate this arc by a polygon chain // Also note, that these vectors are of length 1.0 and thus their endpoints lay outside the model space @@ -940,7 +940,7 @@ namespace OpenSim.Region.Physics.Meshing extr.pushY = (float)pathShearY / 100; //m_log.Warn("pushY: " + extr.pushY); } - + } if (twistTop != 0) @@ -949,9 +949,9 @@ namespace OpenSim.Region.Physics.Meshing if (extr.twistTop > 0) { extr.twistTop = 360 - (-1 * extr.twistTop); - + } - + extr.twistTop = (float)(extr.twistTop * DEG_TO_RAD); } @@ -967,7 +967,7 @@ namespace OpenSim.Region.Physics.Meshing } extr.twistMid = (float)(extr.twistMid * DEG_TO_RAD); } - + if (twistBot != 0) { extr.twistBot = 180 * ((float)twistBot / 100); @@ -1013,7 +1013,7 @@ namespace OpenSim.Region.Physics.Meshing Vertex MM = new Vertex(-0.25f, -0.45f, 0.0f); Vertex PM = new Vertex(+0.5f, 0f, 0.0f); Vertex PP = new Vertex(-0.25f, +0.45f, 0.0f); - + SimpleHull outerHull = new SimpleHull(); //outerHull.AddVertex(MM); @@ -1022,7 +1022,7 @@ namespace OpenSim.Region.Physics.Meshing outerHull.AddVertex(PP); outerHull.AddVertex(MM); outerHull.AddVertex(PM); - + // Deal with cuts now if ((profileBegin != 0) || (profileEnd != 0)) { @@ -1034,7 +1034,7 @@ namespace OpenSim.Region.Physics.Meshing if (fProfileBeginAngle < fProfileEndAngle) fProfileEndAngle -= 360.0; - // Note, that we don't want to cut out a triangle, even if this is a + // Note, that we don't want to cut out a triangle, even if this is a // good approximation for small cuts. Indeed we want to cut out an arc // and we approximate this arc by a polygon chain // Also note, that these vectors are of length 1.0 and thus their endpoints lay outside the model space @@ -1177,7 +1177,7 @@ namespace OpenSim.Region.Physics.Meshing extr.twistTop = 360 - (-1 * extr.twistTop); } - + extr.twistTop = (float)(extr.twistTop * DEG_TO_RAD); } @@ -1255,7 +1255,7 @@ namespace OpenSim.Region.Physics.Meshing // Base Faces of the Icosahedron (20) - SphereLODTriangle(v1, v2, v3, diameter, LOD, m); + SphereLODTriangle(v1, v2, v3, diameter, LOD, m); SphereLODTriangle(v4, v3, v2, diameter, LOD, m); SphereLODTriangle(v4, v5, v6, diameter, LOD, m); SphereLODTriangle(v4, v9, v5, diameter, LOD, m); @@ -1284,7 +1284,7 @@ namespace OpenSim.Region.Physics.Meshing v.Z *= size.Z; } - // This was built with the normals pointing inside.. + // This was built with the normals pointing inside.. // therefore we have to invert the normals foreach (Triangle t in m.triangles) { @@ -1308,7 +1308,7 @@ namespace OpenSim.Region.Physics.Meshing v.Y *= size.Y; v.Z *= size.Z; } - // This was built with the normals pointing inside.. + // This was built with the normals pointing inside.. // therefore we have to invert the normals foreach (Triangle t in sm.triangles) { @@ -1462,7 +1462,7 @@ namespace OpenSim.Region.Physics.Meshing default: mesh = CreateBoxMesh(primName, primShape, size); CalcNormals(mesh); - //Set default mesh to cube otherwise it'll return + //Set default mesh to cube otherwise it'll return // null and crash on the 'setMesh' method in the physics plugins. //mesh = null; break; @@ -1472,6 +1472,6 @@ namespace OpenSim.Region.Physics.Meshing return mesh; } - + } } diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs index 2896d3b..5eeadae 100644 --- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs +++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs @@ -337,7 +337,7 @@ namespace OpenSim.Region.Physics.Meshing } - if (baseStartVertex == null) // i.e. no simplex fulfilled the "outside" condition. + if (baseStartVertex == null) // i.e. no simplex fulfilled the "outside" condition. // In otherwords, subtractHull completely embraces baseHull { return result; diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 4165484..5024b5d 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs @@ -36,7 +36,7 @@ namespace OpenSim.Region.Physics.OdePlugin /// /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. /// - + public enum dParam : int { LowStop = 0, @@ -106,7 +106,7 @@ namespace OpenSim.Region.Physics.OdePlugin private CollisionCategories m_collisionFlags = (CollisionCategories.Geom | CollisionCategories.Space | CollisionCategories.Body - | CollisionCategories.Character + | CollisionCategories.Character | CollisionCategories.Land); public IntPtr Body; private OdeScene _parent_scene; @@ -145,7 +145,7 @@ namespace OpenSim.Region.Physics.OdePlugin { m_colliderarr[i] = false; } - CAPSULE_LENGTH = (size.Z - ((size.Z * height_fudge_factor))); + CAPSULE_LENGTH = (size.Z - ((size.Z * height_fudge_factor))); lock (OdeScene.OdeLock) { @@ -338,7 +338,7 @@ namespace OpenSim.Region.Physics.OdePlugin } /// - /// turn the PID controller on or off. + /// turn the PID controller on or off. /// The PID Controller will turn on all by itself in many situations /// /// @@ -354,7 +354,7 @@ namespace OpenSim.Region.Physics.OdePlugin /// /// This 'puts' an avatar somewhere in the physics space. - /// Not really a good choice unless you 'know' it's a good + /// Not really a good choice unless you 'know' it's a good /// spot otherwise you're likely to orbit the avatar. /// public override PhysicsVector Position @@ -389,7 +389,7 @@ namespace OpenSim.Region.Physics.OdePlugin lock (OdeScene.OdeLock) { d.JointDestroy(Amotor); - + PhysicsVector SetSize = value; float prevCapsule = CAPSULE_LENGTH; float capsuleradius = CAPSULE_RADIUS; @@ -405,7 +405,7 @@ namespace OpenSim.Region.Physics.OdePlugin AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z + (Math.Abs(CAPSULE_LENGTH - prevCapsule) * 2), m_tensor); Velocity = new PhysicsVector(0f, 0f, 0f); - + } _parent_scene.geom_name_map[Shell] = m_name; _parent_scene.actor_name_map[Shell] = (PhysicsActor) this; @@ -423,7 +423,7 @@ namespace OpenSim.Region.Physics.OdePlugin int dAMotorEuler = 1; _parent_scene.waitForSpaceUnlock(_parent_scene.space); Shell = d.CreateCapsule(_parent_scene.space, CAPSULE_RADIUS, CAPSULE_LENGTH); - + d.GeomSetCategoryBits(Shell, (int)m_collisionCategories); d.GeomSetCollideBits(Shell, (int)m_collisionFlags); @@ -442,8 +442,8 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomSetBody(Shell, Body); - - // The purpose of the AMotor here is to keep the avatar's physical + + // The purpose of the AMotor here is to keep the avatar's physical // surrogate from rotating while moving Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero); d.JointAttach(Amotor, Body, IntPtr.Zero); @@ -455,7 +455,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.JointSetAMotorAngle(Amotor, 0, 0); d.JointSetAMotorAngle(Amotor, 1, 0); d.JointSetAMotorAngle(Amotor, 2, 0); - + // These lowstops and high stops are effectively (no wiggle room) d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, -0.000000000001f); d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -0.000000000001f); @@ -464,23 +464,23 @@ namespace OpenSim.Region.Physics.OdePlugin d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0.000000000001f); d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.000000000001f); - // Fudge factor is 1f by default, we're setting it to 0. We don't want it to Fudge or the + // Fudge factor is 1f by default, we're setting it to 0. We don't want it to Fudge or the // capped cyllinder will fall over d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f); d.JointSetAMotorParam(Amotor, (int)dParam.FMax, tensor); - + //d.Matrix3 bodyrotation = d.BodyGetRotation(Body); //d.QfromR( //d.Matrix3 checkrotation = new d.Matrix3(0.7071068,0.5, -0.7071068, - // + // //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22); //standupStraight(); - - - + + + } - // + // /// /// Uses the capped cyllinder volume formula to calculate the avatar's mass. /// This may be used in calculations in the scene/scenepresence @@ -508,13 +508,13 @@ namespace OpenSim.Region.Physics.OdePlugin } -// This code is very useful. Written by DanX0r. We're just not using it right now. +// This code is very useful. Written by DanX0r. We're just not using it right now. // Commented out to prevent a warning. // // private void standupStraight() // { // // The purpose of this routine here is to quickly stabilize the Body while it's popped up in the air. -// // The amotor needs a few seconds to stabilize so without it, the avatar shoots up sky high when you +// // The amotor needs a few seconds to stabilize so without it, the avatar shoots up sky high when you // // change appearance and when you enter the simulator // // After this routine is done, the amotor stabilizes much quicker // d.Vector3 feet; @@ -558,7 +558,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (_zeroFlag) return new PhysicsVector(0f, 0f, 0f); m_lastUpdateSent = false; - return _velocity; + return _velocity; } set { @@ -601,7 +601,7 @@ namespace OpenSim.Region.Physics.OdePlugin } /// - /// Adds the force supplied to the Target Velocity + /// Adds the force supplied to the Target Velocity /// The PID controller takes this target velocity and tries to make it a reality /// /// @@ -616,7 +616,7 @@ namespace OpenSim.Region.Physics.OdePlugin // _target_velocity.Y += force.Y; //_target_velocity.Z += force.Z; } - else + else { m_pidControllerActive = true; _target_velocity.X += force.X; @@ -637,7 +637,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.BodyAddForce(Body, force.X, force.Y, force.Z); //d.BodySetRotation(Body, ref m_StandUpRotation); //standupStraight(); - + } } @@ -655,16 +655,16 @@ namespace OpenSim.Region.Physics.OdePlugin { // no lock; for now it's only called from within Simulate() - // If the PID Controller isn't active then we set our force + // If the PID Controller isn't active then we set our force // calculating base velocity to the current position - + if (m_pidControllerActive == false) { _zeroPosition = d.BodyGetPosition(Body); } //PidStatus = true; - + PhysicsVector vec = new PhysicsVector(); d.Vector3 vel = d.BodyGetLinearVel(Body); float movementdivisor = 1f; @@ -798,13 +798,13 @@ namespace OpenSim.Region.Physics.OdePlugin _velocity.X = 0.0f; _velocity.Y = 0.0f; _velocity.Z = 0.0f; - + // Did we send out the 'stopped' message? if (!m_lastUpdateSent) { m_lastUpdateSent = true; //base.RequestPhysicsterseUpdate(); - + } } else @@ -815,7 +815,7 @@ namespace OpenSim.Region.Physics.OdePlugin _velocity.Y = (vec.Y); _velocity.Z = (vec.Z); - + if (_velocity.Z < -6 && !m_hackSentFall) { m_hackSentFall = true; @@ -849,7 +849,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomDestroy(Shell); _parent_scene.geom_name_map.Remove(Shell); - + //kill the body d.BodyDestroy(Body); } diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 37a8b77..f1886e4 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs @@ -111,7 +111,7 @@ namespace OpenSim.Region.Physics.OdePlugin private IntPtr _linkJointGroup = (IntPtr)0; private PhysicsActor _parent = null; private PhysicsActor m_taintparent = null; - + private bool iscolliding = false; private bool m_isphysical = false; private bool m_isSelected = false; @@ -202,7 +202,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_taintadd = true; _parent_scene.AddPhysicsActorTaint(this); // don't do .add() here; old geoms get recycled with the same hash - + } public override int PhysicsActorType @@ -232,9 +232,9 @@ namespace OpenSim.Region.Physics.OdePlugin public override bool Selected { set { - // This only makes the object not collidable if the object + // This only makes the object not collidable if the object // is physical or the object is modified somehow *IN THE FUTURE* - // without this, if an avatar selects prim, they can walk right + // without this, if an avatar selects prim, they can walk right // through it while it's selected if ((m_isphysical && !_zeroFlag) || !value) @@ -262,7 +262,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags); } //m_log.Warn("Setting Geom to: " + prim_geom); - + } public void enableBodySoft() @@ -277,7 +277,7 @@ namespace OpenSim.Region.Physics.OdePlugin public void disableBodySoft() { m_disabled = true; - + if (m_isphysical) if (Body != (IntPtr)0) d.BodyDisable(Body); @@ -307,7 +307,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.BodySetAutoDisableFlag(Body, true); d.BodySetAutoDisableSteps(Body, 20); - + m_interpenetrationcount = 0; m_collisionscore = 0; m_disabled = false; @@ -327,7 +327,7 @@ namespace OpenSim.Region.Physics.OdePlugin { float volume = 0; - // No material is passed to the physics engines yet.. soo.. + // No material is passed to the physics engines yet.. soo.. // we're using the m_density constant in the class definition @@ -340,7 +340,7 @@ namespace OpenSim.Region.Physics.OdePlugin volume = _size.X*_size.Y*_size.Z; - // If the user has 'hollowed out' + // If the user has 'hollowed out' // ProfileHollow is one of those 0 to 50000 values :P // we like percentages better.. so turning into a percentage @@ -415,7 +415,7 @@ namespace OpenSim.Region.Physics.OdePlugin // We don't know what the shape is yet, so use default volume = _size.X * _size.Y * _size.Z; } - // If the user has 'hollowed out' + // If the user has 'hollowed out' // ProfileHollow is one of those 0 to 50000 values :P // we like percentages better.. so turning into a percentage @@ -427,8 +427,8 @@ namespace OpenSim.Region.Physics.OdePlugin float hollowVolume = 0; switch (_pbs.HollowShape) { - - case HollowShape.Same: + + case HollowShape.Same: case HollowShape.Circle: // Hollow shape is a perfect cyllinder in respect to the cube's scale // Cyllinder hollow volume calculation @@ -447,7 +447,7 @@ namespace OpenSim.Region.Physics.OdePlugin hollowVolume = hollowsizex * hollowsizey * hollowsizez; break; - + case HollowShape.Triangle: // Equilateral Triangular Prism volume hollow calculation @@ -465,7 +465,7 @@ namespace OpenSim.Region.Physics.OdePlugin volume = volume - hollowVolume; } break; - + case ProfileShape.HalfCircle: if (_pbs.PathCurve == (byte)Extrusion.Curve1) { @@ -490,13 +490,13 @@ namespace OpenSim.Region.Physics.OdePlugin } break; case ProfileShape.EquilateralTriangle: - /* + /* v = (abs((xB*yA-xA*yB)+(xC*yB-xB*yC)+(xA*yC-xC*yA))/2) * h - + // seed mesh Vertex MM = new Vertex(-0.25f, -0.45f, 0.0f); Vertex PM = new Vertex(+0.5f, 0f, 0.0f); - Vertex PP = new Vertex(-0.25f, +0.45f, 0.0f); + Vertex PP = new Vertex(-0.25f, +0.45f, 0.0f); */ float xA = -0.25f * _size.X; float yA = -0.45f * _size.Y; @@ -509,7 +509,7 @@ namespace OpenSim.Region.Physics.OdePlugin volume = (float)((Math.Abs((xB * yA - xA * yB) + (xC * yB - xB * yC) + (xA * yC - xC * yA)) / 2) * _size.Z); - // If the user has 'hollowed out' + // If the user has 'hollowed out' // ProfileHollow is one of those 0 to 50000 values :P // we like percentages better.. so turning into a percentage float fhollowFactor = ((float)_pbs.ProfileHollow / 1.9f); @@ -521,7 +521,7 @@ namespace OpenSim.Region.Physics.OdePlugin float hollowVolume = 0; switch (_pbs.HollowShape) { - + case HollowShape.Same: case HollowShape.Triangle: // Equilateral Triangular Prism volume hollow calculation @@ -550,7 +550,7 @@ namespace OpenSim.Region.Physics.OdePlugin hollowVolume = ((float)((Math.PI * Math.Pow(hRadius, 2) * hLength)/2) * hollowAmount); break; - + default: hollowVolume = 0; break; @@ -560,7 +560,7 @@ namespace OpenSim.Region.Physics.OdePlugin break; default: - // we don't have all of the volume formulas yet so + // we don't have all of the volume formulas yet so // use the common volume formula for all volume = _size.X*_size.Y*_size.Z; break; @@ -568,7 +568,7 @@ namespace OpenSim.Region.Physics.OdePlugin // Calculate Path cut effect on volume // Not exact, in the triangle hollow example - // They should never be zero or less then zero.. + // They should never be zero or less then zero.. // we'll ignore it if it's less then zero // ProfileEnd and ProfileBegin are values @@ -672,11 +672,11 @@ namespace OpenSim.Region.Physics.OdePlugin public void setMesh(OdeScene parent_scene, IMesh mesh) { - // This sleeper is there to moderate how long it takes between + // This sleeper is there to moderate how long it takes between // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object - + Thread.Sleep(10); - + //Kill Body so that mesh can re-make the geom if (IsPhysical && Body != (IntPtr) 0) { @@ -694,9 +694,9 @@ namespace OpenSim.Region.Physics.OdePlugin 3*sizeof (int)); d.GeomTriMeshDataPreprocess(_triMeshData); - + _parent_scene.waitForSpaceUnlock(m_targetSpace); - + try { if (prim_geom == (IntPtr)0) @@ -706,7 +706,7 @@ namespace OpenSim.Region.Physics.OdePlugin } catch (AccessViolationException) { - + m_log.Error("[PHYSICS]: MESH LOCKED"); return; } @@ -715,7 +715,7 @@ namespace OpenSim.Region.Physics.OdePlugin // Recreate the body m_interpenetrationcount = 0; m_collisionscore = 0; - + enableBody(); } @@ -724,7 +724,7 @@ namespace OpenSim.Region.Physics.OdePlugin public void ProcessTaints(float timestep) { - + if (m_taintadd) { changeadd(timestep); @@ -779,7 +779,7 @@ namespace OpenSim.Region.Physics.OdePlugin } private void changeAngularLock(float timestep) - { + { // do we have a Physical object? if (Body != IntPtr.Zero) { @@ -809,7 +809,7 @@ namespace OpenSim.Region.Physics.OdePlugin private void changelink(float timestep) { - + if (_parent == null && m_taintparent != null) { if (m_taintparent.PhysicsActorType == (int)ActorTypes.Prim) @@ -834,14 +834,14 @@ namespace OpenSim.Region.Physics.OdePlugin m_linkJoint = (IntPtr)0; } - + _parent = m_taintparent; } private void changeSelectedStatus(float timestep) { - + if (m_taintselected) { @@ -849,9 +849,9 @@ namespace OpenSim.Region.Physics.OdePlugin m_collisionCategories = CollisionCategories.Selected; m_collisionFlags = (CollisionCategories.Sensor | CollisionCategories.Space); - // We do the body disable soft twice because 'in theory' a collision could have happened + // We do the body disable soft twice because 'in theory' a collision could have happened // in between the disabling and the collision properties setting - // which would wake the physical body up from a soft disabling and potentially cause it to fall + // which would wake the physical body up from a soft disabling and potentially cause it to fall // through the ground. if (m_isphysical) @@ -873,9 +873,9 @@ namespace OpenSim.Region.Physics.OdePlugin } else { - + m_collisionCategories = CollisionCategories.Geom; - + if (m_isphysical) m_collisionCategories |= CollisionCategories.Body; @@ -898,10 +898,10 @@ namespace OpenSim.Region.Physics.OdePlugin enableBodySoft(); } - + } - + resetCollisionAccounting(); m_isSelected = m_taintselected; } @@ -918,21 +918,21 @@ namespace OpenSim.Region.Physics.OdePlugin m_taintselected = m_isSelected; m_taintsize = _size; - + m_taintshape = false; m_taintforce = false; - + m_taintdisable = false; m_taintVelocity = PhysicsVector.Zero; } public void changeadd(float timestep) { - - - + + + int[] iprimspaceArrItem = _parent_scene.calculateSpaceArrayItemFromPos(_position); IntPtr targetspace = _parent_scene.calculateSpaceForGeom(_position); @@ -941,7 +941,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_targetSpace = targetspace; - + if (_mesh != null) { @@ -1010,7 +1010,7 @@ namespace OpenSim.Region.Physics.OdePlugin { m_log.Warn("[PHYSICS]: Unable to create physics proxy for object"); ode.dunlock(_parent_scene.world); - return; + return; } } } @@ -1060,7 +1060,7 @@ namespace OpenSim.Region.Physics.OdePlugin } - + _parent_scene.geom_name_map[prim_geom] = this.m_primName; _parent_scene.actor_name_map[prim_geom] = (PhysicsActor)this; @@ -1072,7 +1072,7 @@ namespace OpenSim.Region.Physics.OdePlugin } public void changemove(float timestep) { - + if (m_isphysical) @@ -1080,7 +1080,7 @@ namespace OpenSim.Region.Physics.OdePlugin // This is a fallback.. May no longer be necessary. if (Body == (IntPtr) 0) enableBody(); - //Prim auto disable after 20 frames, + //Prim auto disable after 20 frames, //if you move it, re-enable the prim manually. if (_parent != null) { @@ -1102,7 +1102,7 @@ namespace OpenSim.Region.Physics.OdePlugin } } d.BodyEnable(Body); - + } else { @@ -1122,10 +1122,10 @@ namespace OpenSim.Region.Physics.OdePlugin d.SpaceAdd(m_targetSpace, prim_geom); } } - + changeSelectedStatus(timestep); - + resetCollisionAccounting(); m_taintposition = _position; } @@ -1140,42 +1140,42 @@ namespace OpenSim.Region.Physics.OdePlugin { float PID_D = 2200.0f; //float PID_P = 900.0f; - - + + float m_mass = CalculateMass(); - + fz = 0f; //m_log.Info(m_collisionFlags.ToString()); - + if (m_buoyancy != 0) { - + if (m_buoyancy > 0) { fz = (((-1 * _parent_scene.gravityz) * m_buoyancy) * m_mass); - + //d.Vector3 l_velocity = d.BodyGetLinearVel(Body); //m_log.Info("Using Buoyancy: " + buoyancy + " G: " + (_parent_scene.gravityz * m_buoyancy) + "mass:" + m_mass + " Pos: " + Position.ToString()); } - else + else { fz = (-1 * (((-1 * _parent_scene.gravityz) * (-1 * m_buoyancy)) * m_mass)); } - + } if (m_usePID) { - // If we're using the PID controller, then we have no gravity + // If we're using the PID controller, then we have no gravity fz = (-1 * _parent_scene.gravityz) * this.Mass; // no lock; for now it's only called from within Simulate() - // If the PID Controller isn't active then we set our force + // If the PID Controller isn't active then we set our force // calculating base velocity to the current position if (Environment.OSVersion.Platform == PlatformID.Unix) { @@ -1189,7 +1189,7 @@ namespace OpenSim.Region.Physics.OdePlugin } PID_D = 35f; - + //PID_P = 1.0f; float PID_G = 25; @@ -1197,7 +1197,7 @@ namespace OpenSim.Region.Physics.OdePlugin { PID_G = PID_G / m_PIDTau; } - + if ((PID_G - m_PIDTau) <= 0) { @@ -1205,15 +1205,15 @@ namespace OpenSim.Region.Physics.OdePlugin } //PidStatus = true; - + PhysicsVector vec = new PhysicsVector(); d.Vector3 vel = d.BodyGetLinearVel(Body); - + d.Vector3 pos = d.BodyGetPosition(Body); - _target_velocity = + _target_velocity = new PhysicsVector( (m_PIDTarget.X - pos.X) * ((PID_G - m_PIDTau) * timestep), (m_PIDTarget.Y - pos.Y) * ((PID_G - m_PIDTau) * timestep), @@ -1222,18 +1222,18 @@ namespace OpenSim.Region.Physics.OdePlugin // if velocity is zero, use position control; otherwise, velocity control - + if (_target_velocity.IsIdentical(PhysicsVector.Zero,0.1f)) { // keep track of where we stopped. No more slippin' & slidin' - - + + // We only want to deactivate the PID Controller if we think we want to have our surrogate // react to the physics scene by moving it's position. // Avatar to Avatar collisions // Prim to avatar collisions - + //fx = (_target_velocity.X - vel.X) * (PID_D) + (_zeroPosition.X - pos.X) * (PID_P * 2); //fy = (_target_velocity.Y - vel.Y) * (PID_D) + (_zeroPosition.Y - pos.Y) * (PID_P * 2); //fz = fz + (_target_velocity.Z - vel.Z) * (PID_D) + (_zeroPosition.Z - pos.Z) * PID_P; @@ -1245,27 +1245,27 @@ namespace OpenSim.Region.Physics.OdePlugin } else { - + _zeroFlag = false; - + // We're flying and colliding with something fx = ((_target_velocity.X) - vel.X) * (PID_D); fy = ((_target_velocity.Y) - vel.Y) * (PID_D); - - - + + + // vec.Z = (_target_velocity.Z - vel.Z) * PID_D + (_zeroPosition.Z - pos.Z) * PID_P; fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass); } - } + } fx *= m_mass; fy *= m_mass; //fz *= m_mass; - + //m_log.Info("[OBJPID]: X:" + fx.ToString() + " Y:" + fy.ToString() + " Z:" + fz.ToString()); if (fx != 0 || fy != 0 || fz != 0) { @@ -1285,7 +1285,7 @@ namespace OpenSim.Region.Physics.OdePlugin public void rotate(float timestep) { - + d.Quaternion myrot = new d.Quaternion(); myrot.W = _orientation.w; @@ -1299,7 +1299,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (!m_angularlock.IsIdentical(new PhysicsVector(1, 1, 1), 0)) createAMotor(m_angularlock); } - + resetCollisionAccounting(); m_taintrot = _orientation; } @@ -1313,21 +1313,21 @@ namespace OpenSim.Region.Physics.OdePlugin public void changedisable(float timestep) { - + m_disabled = true; if (Body != (IntPtr)0) { d.BodyDisable(Body); Body = (IntPtr)0; } - + m_taintdisable = false; } public void changePhysicsStatus(float timestep) { - + if (m_isphysical == true) { @@ -1352,7 +1352,7 @@ namespace OpenSim.Region.Physics.OdePlugin public void changesize(float timestamp) { - + //if (!_parent_scene.geom_name_map.ContainsKey(prim_geom)) //{ // m_taintsize = _size; @@ -1369,7 +1369,7 @@ namespace OpenSim.Region.Physics.OdePlugin { // Cleanup meshing here } - //kill body to rebuild + //kill body to rebuild if (IsPhysical && Body != (IntPtr) 0) { disableBody(); @@ -1531,7 +1531,7 @@ namespace OpenSim.Region.Physics.OdePlugin { m_collisionFlags |= CollisionCategories.Water; } - else + else { m_collisionFlags &= ~CollisionCategories.Water; } @@ -1541,7 +1541,7 @@ namespace OpenSim.Region.Physics.OdePlugin public void changeshape(float timestamp) { - + string oldname = _parent_scene.geom_name_map[prim_geom]; // Cleanup of old prim geometry and Bodies @@ -1579,7 +1579,7 @@ namespace OpenSim.Region.Physics.OdePlugin // Re creates body on size. // EnableBody also does setMass() enableBody(); - + } } else @@ -1684,7 +1684,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.BodyEnable(Body); } } - + _parent_scene.geom_name_map[prim_geom] = oldname; @@ -1698,7 +1698,7 @@ namespace OpenSim.Region.Physics.OdePlugin { if (!m_isSelected) { - + lock (m_forcelist) @@ -1728,7 +1728,7 @@ namespace OpenSim.Region.Physics.OdePlugin { if (!m_isSelected) { - + Thread.Sleep(20); if (IsPhysical) @@ -1737,8 +1737,8 @@ namespace OpenSim.Region.Physics.OdePlugin { d.BodySetLinearVel(Body, m_taintVelocity.X, m_taintVelocity.Y, m_taintVelocity.Z); } - } - + } + //resetCollisionAccounting(); } m_taintVelocity = PhysicsVector.Zero; @@ -1794,7 +1794,7 @@ namespace OpenSim.Region.Physics.OdePlugin { get { return _position; } - set { _position = value; + set { _position = value; //m_log.Info("[PHYSICS]: " + _position.ToString()); } } @@ -1838,7 +1838,7 @@ namespace OpenSim.Region.Physics.OdePlugin { get { - // Averate previous velocity with the new one so + // Averate previous velocity with the new one so // client object interpolation works a 'little' better PhysicsVector returnVelocity = new PhysicsVector(); returnVelocity.X = (m_lastVelocity.X + _velocity.X)/2; @@ -1849,7 +1849,7 @@ namespace OpenSim.Region.Physics.OdePlugin set { _velocity = value; - + m_taintVelocity = value; _parent_scene.AddPhysicsActorTaint(this); } @@ -1898,11 +1898,11 @@ namespace OpenSim.Region.Physics.OdePlugin if (_zeroFlag) return pv; m_lastUpdateSent = false; - + if (m_rotationalVelocity.IsIdentical(pv, 0.2f)) return pv; - return m_rotationalVelocity; + return m_rotationalVelocity; } set { m_rotationalVelocity = value; } } @@ -1948,7 +1948,7 @@ namespace OpenSim.Region.Physics.OdePlugin } public void UpdatePositionAndVelocity() - { + { // no lock; called from Simulate() -- if you call this from elsewhere, gotta lock or do Monitor.Enter/Exit! if (_parent != null) { @@ -1963,7 +1963,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.Quaternion ori = d.BodyGetQuaternion(Body); d.Vector3 vel = d.BodyGetLinearVel(Body); d.Vector3 rotvel = d.BodyGetAngularVel(Body); - + PhysicsVector l_position = new PhysicsVector(); // kluge to keep things in bounds. ODE lets dead avatars drift away (they should be removed!) @@ -2000,16 +2000,16 @@ namespace OpenSim.Region.Physics.OdePlugin if (l_position.Z < 0) { - // This is so prim that get lost underground don't fall forever and suck up - // + // This is so prim that get lost underground don't fall forever and suck up + // // Sim resources and memory. - // Disables the prim's movement physics.... + // Disables the prim's movement physics.... // It's a hack and will generate a console message if it fails. //IsPhysical = false; if (_parent == null) base.RaiseOutOfBounds(_position); - + _acceleration.X = 0; _acceleration.Y = 0; _acceleration.Z = 0; @@ -2020,10 +2020,10 @@ namespace OpenSim.Region.Physics.OdePlugin m_rotationalVelocity.X = 0; m_rotationalVelocity.Y = 0; m_rotationalVelocity.Z = 0; - + if (_parent == null) base.RequestPhysicsterseUpdate(); - + m_throttleUpdates = false; throttleCounter = 0; _zeroFlag = true; @@ -2065,10 +2065,10 @@ namespace OpenSim.Region.Physics.OdePlugin m_throttleUpdates = false; throttleCounter = 0; m_rotationalVelocity = pv; - + if (_parent == null) base.RequestPhysicsterseUpdate(); - + m_lastUpdateSent = true; } } @@ -2087,11 +2087,11 @@ namespace OpenSim.Region.Physics.OdePlugin _velocity.X = vel.X; _velocity.Y = vel.Y; _velocity.Z = vel.Z; - + _acceleration = ((_velocity - m_lastVelocity) / 0.1f); _acceleration = new PhysicsVector(_velocity.X - m_lastVelocity.X / 0.1f, _velocity.Y - m_lastVelocity.Y / 0.1f, _velocity.Z - m_lastVelocity.Z / 0.1f); //m_log.Info("[PHYSICS]: V1: " + _velocity + " V2: " + m_lastVelocity + " Acceleration: " + _acceleration.ToString()); - + if (_velocity.IsIdentical(pv, 0.5f)) { m_rotationalVelocity = pv; @@ -2173,7 +2173,7 @@ namespace OpenSim.Region.Physics.OdePlugin { m_tensor = 5f; } - + float axisnum = 3; axisnum = (axisnum - (axis.X + axis.Y + axis.Z)); @@ -2222,7 +2222,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 0.000000000001f); d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0.000000000001f); d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.000000000001f); - + d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f); d.JointSetAMotorParam(Amotor, (int)dParam.FMax, m_tensor); } diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index d795e45..c663fb0 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -42,7 +42,7 @@ using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.Physics.OdePlugin { /// - /// ODE plugin + /// ODE plugin /// public class OdePlugin : IPhysicsPlugin { @@ -51,7 +51,6 @@ namespace OpenSim.Region.Physics.OdePlugin private CollisionLocker ode; private OdeScene _mScene; - public OdePlugin() { ode = new CollisionLocker(); @@ -81,15 +80,13 @@ namespace OpenSim.Region.Physics.OdePlugin } } - - public enum StatusIndicators : int + public enum StatusIndicators : int { Generic = 0, Start = 1, End = 2 } - public struct sCollisionData { public uint ColliderLocalId; @@ -165,7 +162,6 @@ namespace OpenSim.Region.Physics.OdePlugin private float mAvatarObjectContactFriction = 75f; private float mAvatarObjectContactBounce = 0.1f; - private float avPIDD = 3200f; private float avPIDP = 1400f; private float avCapRadius = 0.37f; @@ -175,13 +171,12 @@ namespace OpenSim.Region.Physics.OdePlugin private float avMovementDivisorWalk = 1.3f; private float avMovementDivisorRun = 0.8f; - private float[] _heightmap; private float[] _watermap; private float[] _origheightmap; - + private d.NearCallback nearCallback; public d.TriCallback triCallback; public d.TriArrayCallback triArrayCallback; @@ -200,7 +195,6 @@ namespace OpenSim.Region.Physics.OdePlugin private d.Contact AvatarMovementTerrainContact; private d.Contact WaterContact; - //Ckrinke: Comment out until used. We declare it, initialize it, but do not use it //Ckrinke private int m_randomizeWater = 200; private int m_physicsiterations = 10; @@ -233,7 +227,6 @@ namespace OpenSim.Region.Physics.OdePlugin private IConfigSource m_config; - /// /// Initiailizes the scene /// Sets many properties that ODE requires to be stable @@ -245,44 +238,34 @@ namespace OpenSim.Region.Physics.OdePlugin nearCallback = near; triCallback = TriCallback; triArrayCallback = TriArrayCallback; - - - lock (OdeLock) { - - // Creat the world and the first space + // Create the world and the first space world = d.WorldCreate(); space = d.HashSpaceCreate(IntPtr.Zero); - + contactgroup = d.JointGroupCreate(0); //contactgroup - - - d.WorldSetAutoDisableFlag(world, false); - } // zero out a heightmap array float array (single dimention [flattened])) _heightmap = new float[514*514]; _watermap = new float[258 * 258]; - // Zero out the prim spaces array (we split our space into smaller spaces so + // Zero out the prim spaces array (we split our space into smaller spaces so // we can hit test less. - } - // Initialize the mesh plugin public override void Initialise(IMesher meshmerizer, IConfigSource config) { mesher = meshmerizer; m_config = config; // Defaults - + if (Environment.OSVersion.Platform == PlatformID.Unix) { avPIDD = 3200.0f; @@ -349,10 +332,7 @@ namespace OpenSim.Region.Physics.OdePlugin avPIDP = physicsconfig.GetFloat("av_pid_proportional_win", 900.0f); avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_win", 550000f); } - - } - } staticPrimspace = new IntPtr[(int)(300 / metersInSpace), (int)(300 / metersInSpace)]; @@ -361,8 +341,8 @@ namespace OpenSim.Region.Physics.OdePlugin contact.surface.mu = nmAvatarObjectContactFriction; contact.surface.bounce = nmAvatarObjectContactBounce; - // Terrain contact friction and Bounce - // This is the *non* moving version. Use this when an avatar + // Terrain contact friction and Bounce + // This is the *non* moving version. Use this when an avatar // isn't moving to keep it in place better TerrainContact.surface.mode |= d.ContactFlags.SoftERP; TerrainContact.surface.mu = nmTerrainContactFriction; @@ -376,7 +356,7 @@ namespace OpenSim.Region.Physics.OdePlugin WaterContact.surface.soft_erp = 0.010f; // Prim contact friction and bounce - // THis is the *non* moving version of friction and bounce + // THis is the *non* moving version of friction and bounce // Use this when an avatar comes in contact with a prim // and is moving AvatarMovementprimContact.surface.mu = mAvatarObjectContactFriction; @@ -409,7 +389,6 @@ namespace OpenSim.Region.Physics.OdePlugin staticPrimspace[i, j] = IntPtr.Zero; } } - } internal void waitForSpaceUnlock(IntPtr space) @@ -439,17 +418,17 @@ namespace OpenSim.Region.Physics.OdePlugin private void near(IntPtr space, IntPtr g1, IntPtr g2) { // no lock here! It's invoked from within Simulate(), which is thread-locked - - // Test if we're collidng a geom with a space. + + // Test if we're colliding a geom with a space. // If so we have to drill down into the space recursively if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2)) { if (g1 == (IntPtr)0 || g2 == (IntPtr)0) return; - // Separating static prim geometry spaces. - // We'll be calling near recursivly if one - // of them is a space to find all of the + // Separating static prim geometry spaces. + // We'll be calling near recursivly if one + // of them is a space to find all of the // contact points in the space try { @@ -462,13 +441,12 @@ namespace OpenSim.Region.Physics.OdePlugin } //Colliding a space or a geom with a space or a geom. so drill down - //Collide all geoms in each space.. + //Collide all geoms in each space.. //if (d.GeomIsSpace(g1)) d.SpaceCollide(g1, IntPtr.Zero, nearCallback); //if (d.GeomIsSpace(g2)) d.SpaceCollide(g2, IntPtr.Zero, nearCallback); return; } - if (g1 == (IntPtr)0 || g2 == (IntPtr)0) return; @@ -499,23 +477,17 @@ namespace OpenSim.Region.Physics.OdePlugin int count = 0; try { - // Colliding Geom To Geom // This portion of the function 'was' blatantly ripped off from BoxStack.cs - - - if (g1 == g2) return; // Can't collide with yourself if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact)) return; - + lock (contacts) { - - count = d.Collide(g1, g2, contacts.GetLength(0), contacts, d.ContactGeom.SizeOf); } } @@ -527,7 +499,7 @@ namespace OpenSim.Region.Physics.OdePlugin } catch (AccessViolationException) { - + m_log.Warn("[PHYSICS]: Unable to collide test an object"); return; } @@ -539,6 +511,7 @@ namespace OpenSim.Region.Physics.OdePlugin { p1 = PANull; } + if (!actor_name_map.TryGetValue(g2, out p2)) { p2 = PANull; @@ -554,14 +527,10 @@ namespace OpenSim.Region.Physics.OdePlugin // If we're colliding with terrain, use 'TerrainContact' instead of contact. // allows us to have different settings - - // We only need to test p2 for 'jump crouch purposes' p2.IsColliding = true; //if ((framecount % m_returncollisions) == 0) - - switch (p1.PhysicsActorType) { @@ -588,41 +557,39 @@ namespace OpenSim.Region.Physics.OdePlugin { //This is disabled at the moment only because it needs more tweaking //It will eventually be uncommented - + if (contacts[i].depth >= 1.00f) { //m_log.Debug("[PHYSICS]: " + contacts[i].depth.ToString()); } - + //If you interpenetrate a prim with an agent if ((p2.PhysicsActorType == (int) ActorTypes.Agent && p1.PhysicsActorType == (int) ActorTypes.Prim) || (p1.PhysicsActorType == (int) ActorTypes.Agent && p2.PhysicsActorType == (int) ActorTypes.Prim)) { - - # region disabled code1 //contacts[i].depth = contacts[i].depth * 4.15f; /* if (p2.PhysicsActorType == (int) ActorTypes.Agent) - { + { p2.CollidingObj = true; contacts[i].depth = 0.003f; p2.Velocity = p2.Velocity + new PhysicsVector(0, 0, 2.5f); OdeCharacter character = (OdeCharacter) p2; character.SetPidStatus(true); contacts[i].pos = new d.Vector3(contacts[i].pos.X + (p1.Size.X / 2), contacts[i].pos.Y + (p1.Size.Y / 2), contacts[i].pos.Z + (p1.Size.Z / 2)); - + } else { - + //contacts[i].depth = 0.0000000f; } if (p1.PhysicsActorType == (int) ActorTypes.Agent) { - + p1.CollidingObj = true; contacts[i].depth = 0.003f; p1.Velocity = p1.Velocity + new PhysicsVector(0, 0, 2.5f); @@ -632,14 +599,12 @@ namespace OpenSim.Region.Physics.OdePlugin } else { - + //contacts[i].depth = 0.0000000f; } */ #endregion - } - // If you interpenetrate a prim with another prim if (p1.PhysicsActorType == (int) ActorTypes.Prim && p2.PhysicsActorType == (int) ActorTypes.Prim) @@ -649,7 +614,6 @@ namespace OpenSim.Region.Physics.OdePlugin //OdePrim op2 = (OdePrim)p2; //op1.m_collisionscore++; //op2.m_collisionscore++; - //if (op1.m_collisionscore > 8000 || op2.m_collisionscore > 8000) //{ @@ -658,11 +622,10 @@ namespace OpenSim.Region.Physics.OdePlugin //op2.m_taintdisable = true; //AddPhysicsActorTaint(p2); //} - + //if (contacts[i].depth >= 0.25f) //{ // Don't collide, one or both prim will expld. - //op1.m_interpenetrationcount++; //op2.m_interpenetrationcount++; @@ -678,17 +641,17 @@ namespace OpenSim.Region.Physics.OdePlugin //AddPhysicsActorTaint(p2); //} - //contacts[i].depth = contacts[i].depth / 8f; //contacts[i].normal = new d.Vector3(0, 0, 1); //} //if (op1.m_disabled || op2.m_disabled) //{ - //Manually disabled objects stay disabled + //Manually disabled objects stay disabled //contacts[i].depth = 0f; //} #endregion } + if (contacts[i].depth >= 1.00f) { //m_log.Info("[P]: " + contacts[i].depth.ToString()); @@ -713,6 +676,7 @@ namespace OpenSim.Region.Physics.OdePlugin else { } + if (p1.PhysicsActorType == (int) ActorTypes.Agent) { OdeCharacter character = (OdeCharacter)p1; @@ -738,7 +702,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (contacts[i].depth >= 0f) { - // If we're collidng against terrain + // If we're colliding against terrain if (name1 == "Terrain" || name2 == "Terrain") { // If we're moving @@ -760,12 +724,11 @@ namespace OpenSim.Region.Physics.OdePlugin { if ((p2.PhysicsActorType == (int)ActorTypes.Prim)) { - } else { - } + //WaterContact.surface.soft_cfm = 0.0000f; //WaterContact.surface.soft_erp = 0.00000f; if (contacts[i].depth > 0.1f) @@ -775,7 +738,7 @@ namespace OpenSim.Region.Physics.OdePlugin //contacts[i].pos = new d.Vector3(0, 0, contacts[i].pos.Z - 5f); } WaterContact.geom = contacts[i]; - + joint = d.JointCreateContact(world, contactgroup, ref WaterContact); //m_log.Info("[PHYSICS]: Prim Water Contact" + contacts[i].depth); @@ -806,7 +769,7 @@ namespace OpenSim.Region.Physics.OdePlugin { // If there are more then 3 contact points, it's likely // that we've got a pile of objects - // + // // We don't want to send out hundreds of terse updates over and over again // so lets throttle them and send them again after it's somewhat sorted out. p2.ThrottleUpdates = true; @@ -814,7 +777,6 @@ namespace OpenSim.Region.Physics.OdePlugin //System.Console.WriteLine(count.ToString()); //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2); } - } private void collision_accounting_events(PhysicsActor p1, PhysicsActor p2, float collisiondepth) @@ -831,7 +793,7 @@ namespace OpenSim.Region.Physics.OdePlugin { case ActorTypes.Agent: cc2 = (OdeCharacter)p2; - + obj1LocalID = cc2.m_localID; switch ((ActorTypes)p1.PhysicsActorType) { @@ -840,7 +802,7 @@ namespace OpenSim.Region.Physics.OdePlugin obj2LocalID = cc1.m_localID; cc1.AddCollisionEvent(cc2.m_localID, collisiondepth); //ctype = (int)CollisionCategories.Character; - + //if (cc1.CollidingObj) //cStartStop = (int)StatusIndicators.Generic; //else @@ -858,7 +820,7 @@ namespace OpenSim.Region.Physics.OdePlugin //cStartStop = (int)StatusIndicators.Generic; //else //cStartStop = (int)StatusIndicators.Start; - + //returncollisions = true; break; @@ -869,14 +831,12 @@ namespace OpenSim.Region.Physics.OdePlugin //returncollisions = true; break; } - - cc2.AddCollisionEvent(obj2LocalID, collisiondepth); break; case ActorTypes.Prim: cp2 = (OdePrim)p2; - + obj1LocalID = cp2.m_localID; switch ((ActorTypes)p1.PhysicsActorType) { @@ -891,7 +851,7 @@ namespace OpenSim.Region.Physics.OdePlugin //else //cStartStop = (int)StatusIndicators.Start; //returncollisions = true; - + break; case ActorTypes.Prim: cp1 = (OdePrim)p1; @@ -903,7 +863,7 @@ namespace OpenSim.Region.Physics.OdePlugin //cStartStop = (int)StatusIndicators.Generic; //else //cStartStop = (int)StatusIndicators.Start; - + //returncollisions = true; break; @@ -911,11 +871,11 @@ namespace OpenSim.Region.Physics.OdePlugin case ActorTypes.Unknown: obj2LocalID = 0; //ctype = (int)CollisionCategories.Land; - + //returncollisions = true; break; } - + cp2.AddCollisionEvent(obj2LocalID, collisiondepth); break; } @@ -999,7 +959,7 @@ namespace OpenSim.Region.Physics.OdePlugin /// private void collision_optimized(float timeStep) { - + foreach (OdeCharacter chr in _characters) { // Reset the collision values to false @@ -1008,7 +968,7 @@ namespace OpenSim.Region.Physics.OdePlugin chr.IsColliding = false; chr.CollidingGround = false; chr.CollidingObj = false; - + // test the avatar's geometry for collision with the space // This will return near and the space that they are the closest to // And we'll run this again against the avatar and the space segment @@ -1029,15 +989,11 @@ namespace OpenSim.Region.Physics.OdePlugin //forcedZ = true; //} } - - lock (_activeprims) { - foreach (OdePrim chr in _activeprims) { - if (d.BodyIsEnabled(chr.Body) && (!chr.m_disabled)) { try @@ -1049,18 +1005,14 @@ namespace OpenSim.Region.Physics.OdePlugin else m_log.Debug("[PHYSICS]: unable to collide test active prim against space. The space was zero, the geom was zero or it was in the process of being removed"); } - } catch (AccessViolationException) { m_log.Warn("[PHYSICS]: Unable to space collide"); } - } - } } - } #endregion @@ -1077,7 +1029,6 @@ namespace OpenSim.Region.Physics.OdePlugin { if (!_collisionEventPrim.Contains(obj)) _collisionEventPrim.Add(obj); - } } @@ -1090,7 +1041,6 @@ namespace OpenSim.Region.Physics.OdePlugin } } - #region Add/Remove Entities public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size) @@ -1131,8 +1081,6 @@ namespace OpenSim.Region.Physics.OdePlugin rot.y = rotation.y; rot.z = rotation.z; - - OdePrim newPrim; lock (OdeLock) { @@ -1141,7 +1089,6 @@ namespace OpenSim.Region.Physics.OdePlugin _prims.Add(newPrim); } - return newPrim; } @@ -1178,11 +1125,9 @@ namespace OpenSim.Region.Physics.OdePlugin result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical); - return result; } - public void remActivePrim(OdePrim deactivatePrim) { lock (_activeprims) @@ -1210,8 +1155,8 @@ namespace OpenSim.Region.Physics.OdePlugin /// This is called from within simulate but outside the locked portion /// We need to do our own locking here /// Essentially, we need to remove the prim from our space segment, whatever segment it's in. - /// - /// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory + /// + /// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory /// that the space was using. /// /// @@ -1226,7 +1171,6 @@ namespace OpenSim.Region.Physics.OdePlugin { prim.ResetTaints(); - if (prim.IsPhysical) { prim.disableBody(); @@ -1267,7 +1211,6 @@ namespace OpenSim.Region.Physics.OdePlugin { m_log.Warn("[PHYSICS]: Unable to remove prim from physics scene"); } - } catch (AccessViolationException) { @@ -1297,8 +1240,6 @@ namespace OpenSim.Region.Physics.OdePlugin //} //} } - - } } } @@ -1337,12 +1278,11 @@ namespace OpenSim.Region.Physics.OdePlugin /// a pointer to the new space it's in public IntPtr recalculateSpaceForGeom(IntPtr geom, PhysicsVector pos, IntPtr currentspace) { - - // Called from setting the Position and Size of an ODEPrim so + // Called from setting the Position and Size of an ODEPrim so // it's already in locked space. // we don't want to remove the main space - // we don't need to test physical here because this function should + // we don't need to test physical here because this function should // never be called if the prim is physical(active) // All physical prim end up in the root space @@ -1399,7 +1339,7 @@ namespace OpenSim.Region.Physics.OdePlugin waitForSpaceUnlock(space); d.SpaceRemove(space, currentspace); // free up memory used by the space. - + //d.SpaceDestroy(currentspace); resetSpaceArrayItemToZero(currentspace); } @@ -1418,7 +1358,6 @@ namespace OpenSim.Region.Physics.OdePlugin { if (d.SpaceQuery(currentspace, geom)) { - if (d.GeomIsSpace(currentspace)) { waitForSpaceUnlock(currentspace); @@ -1453,8 +1392,8 @@ namespace OpenSim.Region.Physics.OdePlugin } } - // The routines in the Position and Size sections do the 'inserting' into the space, - // so all we have to do is make sure that the space that we're putting the prim into + // The routines in the Position and Size sections do the 'inserting' into the space, + // so all we have to do is make sure that the space that we're putting the prim into // is in the 'main' space. int[] iprimspaceArrItem = calculateSpaceArrayItemFromPos(pos); IntPtr newspace = calculateSpaceForGeom(pos); @@ -1492,11 +1431,11 @@ namespace OpenSim.Region.Physics.OdePlugin public IntPtr calculateSpaceForGeom(PhysicsVector pos) { IntPtr locationbasedspace =IntPtr.Zero; - + int[] xyspace = calculateSpaceArrayItemFromPos(pos); //m_log.Info("[Physics]: Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]]; - + //locationbasedspace = space; return locationbasedspace; } @@ -1523,13 +1462,10 @@ namespace OpenSim.Region.Physics.OdePlugin if (returnint[1] < 0) returnint[1] = 0; - return returnint; } - #endregion - - + #endregion /// /// Routine to figure out if we need to mesh this prim with our mesher @@ -1564,7 +1500,6 @@ namespace OpenSim.Region.Physics.OdePlugin return false; } - /// /// Called after our prim properties are set Scale, position etc. /// We use this event queue like method to keep changes to the physical scene occuring in the threadlocked mutex @@ -1586,7 +1521,7 @@ namespace OpenSim.Region.Physics.OdePlugin /// /// This is our main simulate loop - /// It's thread locked by a Mutex in the scene. + /// It's thread locked by a Mutex in the scene. /// It holds Collisions, it instructs ODE to step through the physical reactions /// It moves the objects around in memory /// It calls the methods that report back to the object owners.. (scenepresence, SceneObjectGroup) @@ -1597,7 +1532,7 @@ namespace OpenSim.Region.Physics.OdePlugin { if (framecount >= int.MaxValue) framecount = 0; - + framecount++; float fps = 0; @@ -1605,12 +1540,11 @@ namespace OpenSim.Region.Physics.OdePlugin step_time += timeStep; - // If We're loaded down by something else, + // If We're loaded down by something else, // or debugging with the Visual Studio project on pause // skip a few frames to catch up gracefully. // without shooting the physicsactors all over the place - if (step_time >= m_SkipFramesAtms) { // Instead of trying to catch up, it'll do 5 physics frames only @@ -1623,7 +1557,7 @@ namespace OpenSim.Region.Physics.OdePlugin } lock (OdeLock) { - // Process 10 frames if the sim is running normal.. + // Process 10 frames if the sim is running normal.. // process 5 frames if the sim is running slow //try //{ @@ -1642,13 +1576,13 @@ namespace OpenSim.Region.Physics.OdePlugin //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size step_time = 0.09375f; fps = (step_time/ODE_STEPSIZE) * 1000; - + while (step_time > 0.0f) { //lock (ode) //{ //if (!ode.lockquery()) - //{ + //{ // ode.dlock(world); try { @@ -1661,9 +1595,8 @@ namespace OpenSim.Region.Physics.OdePlugin } } - bool processedtaints = false; - + lock (_taintedPrim) { foreach (OdePrim prim in _taintedPrim) @@ -1679,10 +1612,9 @@ namespace OpenSim.Region.Physics.OdePlugin processedtaints = true; prim.m_collisionscore = 0; } - + if (processedtaints) _taintedPrim = new List(); - } lock (_activeprims) @@ -1696,7 +1628,6 @@ namespace OpenSim.Region.Physics.OdePlugin //if ((framecount % m_randomizeWater) == 0) // randomizeWater(waterlevel); - collision_optimized(timeStep); @@ -1718,7 +1649,6 @@ namespace OpenSim.Region.Physics.OdePlugin pobj.SendCollisions(); break; } - } } @@ -1726,13 +1656,13 @@ namespace OpenSim.Region.Physics.OdePlugin d.JointGroupEmpty(contactgroup); //ode.dunlock(world); - } + } catch (Exception e) { m_log.Error("[PHYSICS]: " + e.Message.ToString() + e.TargetSite.ToString()); ode.dunlock(world); } - + step_time -= ODE_STEPSIZE; i++; //} @@ -1765,7 +1695,6 @@ namespace OpenSim.Region.Physics.OdePlugin } } } - } return fps; } @@ -1780,7 +1709,7 @@ namespace OpenSim.Region.Physics.OdePlugin get { return (false); } } - #region ODE Specific Terrain Fixes + #region ODE Specific Terrain Fixes public float[] ResizeTerrain512NearestNeighbour(float[] heightMap) { float[] returnarr = new float[262144]; @@ -1800,7 +1729,7 @@ namespace OpenSim.Region.Physics.OdePlugin // This particular way is quick but it only works on a multiple of the original // The idea behind this method can be described with the following diagrams - // second pass and third pass happen in the same loop really.. just separated + // second pass and third pass happen in the same loop really.. just separated // them to show what this does. // First Pass @@ -1893,6 +1822,7 @@ namespace OpenSim.Region.Physics.OdePlugin return returnarr; } + public float[] ResizeTerrain512Interpolation(float[] heightMap) { float[] returnarr = new float[262144]; @@ -1912,7 +1842,7 @@ namespace OpenSim.Region.Physics.OdePlugin // This particular way is quick but it only works on a multiple of the original // The idea behind this method can be described with the following diagrams - // second pass and third pass happen in the same loop really.. just separated + // second pass and third pass happen in the same loop really.. just separated // them to show what this does. // First Pass @@ -2139,7 +2069,6 @@ namespace OpenSim.Region.Physics.OdePlugin // m_log.Info((baseheight - 0.1f) + ((float)fluidRandomizer.Next(1, 9) / 10f)); } - lock (OdeLock) { if (!(WaterGeom == (IntPtr)0)) @@ -2183,7 +2112,6 @@ namespace OpenSim.Region.Physics.OdePlugin { lock (OdeLock) { - foreach (OdePrim prm in _prims) { RemovePrim(prm); diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs index 9ca1b23..82ce144 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs @@ -171,12 +171,12 @@ namespace OpenSim.Region.Physics.POSPlugin { if (check_collision(c, _prims[i])) { - + return true; } } - + return false; } @@ -234,7 +234,7 @@ namespace OpenSim.Region.Physics.POSPlugin character.Position.Z += character._target_velocity.Z*timeStep; } - /// this is it -- the magic you've all been waiting for! Ladies and gentlemen -- + /// this is it -- the magic you've all been waiting for! Ladies and gentlemen -- /// Completely Bogus Collision Detection!!! /// better known as the CBCD algorithm diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index afc3ff2..2c33b57 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs @@ -108,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.Common public void state(string state) { State = state; - + } public void Start(BuilIn_Commands LSL_Functions) @@ -125,9 +125,9 @@ namespace OpenSim.Region.ScriptEngine.Common ads.ConfigurationFile ); - // Display the name of the calling AppDomain and the name + // Display the name of the calling AppDomain and the name // of the second domain. - // NOTE: The application's thread has transitioned between + // NOTE: The application's thread has transitioned between // AppDomains. Console.WriteLine("Calling to '{0}'.", Thread.GetDomain().FriendlyName diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs index 2e35b46..2887f1e 100644 --- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs +++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// protected bool m_Running = true; /// - /// True indicates that the ScriptManager has stopped + /// True indicates that the ScriptManager has stopped /// this script. This prevents a script that has been /// stopped as part of deactivation from being /// resumed by a pending llSetScriptState request. diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index d73a47a..ab91424 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -57,7 +57,7 @@ namespace OpenSim.Region.ScriptEngine.Common internal uint m_localID; internal LLUUID m_itemID; internal bool throwErrorOnNotImplemented = true; - + public LSL_BuiltIn_Commands(ScriptEngineBase.ScriptEngine ScriptEngine, SceneObjectPart host, uint localID, LLUUID itemID) { m_ScriptEngine = ScriptEngine; @@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Common try { int eventFlags = m_ScriptEngine.m_ScriptManager.GetStateEventFlags(m_localID, m_itemID); - m_host.SetScriptEvents(m_itemID, eventFlags); + m_host.SetScriptEvents(m_itemID, eventFlags); m_ScriptEngine.m_EventManager.state_entry(m_localID); } catch (AppDomainUnloadedException) @@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Common World.EventManager.TriggerRequestChangeWaterHeight((float)height); } } - + //These are the implementations of the various ll-functions used by the LSL scripts. //starting out, we use the System.Math library for trig functions. - ckrinke 8-14-07 public double llSin(double f) @@ -331,9 +331,9 @@ namespace OpenSim.Region.ScriptEngine.Common // New and improved, now actually works as described. Prim rotates as expected as does llRot2Euler. /* From wiki: - The Euler angle vector (in radians) is converted to a rotation by doing the rotations around the 3 axes - in Z, Y, X order. So llEuler2Rot(<1.0, 2.0, 3.0> * DEG_TO_RAD) generates a rotation by taking the zero rotation, - a vector pointing along the X axis, first rotating it 3 degrees around the global Z axis, then rotating the resulting + The Euler angle vector (in radians) is converted to a rotation by doing the rotations around the 3 axes + in Z, Y, X order. So llEuler2Rot(<1.0, 2.0, 3.0> * DEG_TO_RAD) generates a rotation by taking the zero rotation, + a vector pointing along the X axis, first rotating it 3 degrees around the global Z axis, then rotating the resulting vector 2 degrees around the global Y axis, and finally rotating that 1 degree around the global X axis. */ @@ -349,24 +349,24 @@ namespace OpenSim.Region.ScriptEngine.Common double sinX = Math.Sin(v.x); double sinY = Math.Sin(v.y); double sinZ = Math.Sin(v.z); - - s = Math.Sqrt( cosY * cosZ - sinX * sinY * sinZ + cosX * cosZ + cosX * cosY + 1.0f) * 0.5f; + + s = Math.Sqrt(cosY * cosZ - sinX * sinY * sinZ + cosX * cosZ + cosX * cosY + 1.0f) * 0.5f; if (Math.Abs(s) < 0.00001) // null rotation { - x = 0.0f; + x = 0.0f; y = 1.0f; - z = 0.0f; + z = 0.0f; } else { - s_i = 1.0f / (4.0f * s); - x = - ( -sinX * cosY - cosX * sinY * sinZ - sinX * cosZ) * s_i; - y = - ( -cosX * sinY * cosZ + sinX * sinZ - sinY) * s_i; - z = - ( -cosY * sinZ - sinX * sinY * cosZ - cosX * sinZ) * s_i; + s_i = 1.0f / (4.0f * s); + x = - (-sinX * cosY - cosX * sinY * sinZ - sinX * cosZ) * s_i; + y = - (-cosX * sinY * cosZ + sinX * sinZ - sinY) * s_i; + z = - (-cosY * sinZ - sinX * sinY * cosZ - cosX * sinZ) * s_i; } return new LSL_Types.Quaternion(x, y, z, s); } - + public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up) { @@ -477,7 +477,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); LLUUID keyID = LLUUID.Zero; LLUUID.TryParse(id, out keyID); - + m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host); } @@ -625,7 +625,7 @@ namespace OpenSim.Region.ScriptEngine.Common return String.Empty; - + } public LSL_Types.LSLInteger llDetectedType(int number) @@ -644,7 +644,7 @@ namespace OpenSim.Region.ScriptEngine.Common mask |= 0x04; // passive non-moving else mask |= 0x02; // active moving - if (SensedObject is IScript) mask |= 0x08; // Scripted. It COULD have one hidden ... + if (SensedObject is IScript) mask |= 0x08; // Scripted. It COULD have one hidden ... return mask; } @@ -655,7 +655,7 @@ namespace OpenSim.Region.ScriptEngine.Common EntityBase SensedObject = entityDetectedKey(number); if (SensedObject == null) return new LSL_Types.Vector3(0, 0, 0); - + return new LSL_Types.Vector3(SensedObject.AbsolutePosition.X,SensedObject.AbsolutePosition.Y,SensedObject.AbsolutePosition.Z); } @@ -757,7 +757,7 @@ namespace OpenSim.Region.ScriptEngine.Common if ((status & BuiltIn_Commands_BaseClass.STATUS_ROTATE_X) == BuiltIn_Commands_BaseClass.STATUS_ROTATE_X) { statusrotationaxis |= BuiltIn_Commands_BaseClass.STATUS_ROTATE_X; - + } if ((status & BuiltIn_Commands_BaseClass.STATUS_ROTATE_Y) == BuiltIn_Commands_BaseClass.STATUS_ROTATE_Y) { @@ -824,9 +824,9 @@ namespace OpenSim.Region.ScriptEngine.Common if (m_host.GetDieAtEdge()) return 1; - else + else return 0; - + case BuiltIn_Commands_BaseClass.STATUS_RETURN_AT_EDGE: NotImplemented("llGetStatus - STATUS_RETURN_AT_EDGE"); return 0; @@ -1248,7 +1248,7 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); return m_host.registerTargetWaypoint(new LLVector3((float)position.x, (float)position.y, (float)position.z), (float)range); - + } public void llTargetRemove(int number) @@ -1286,21 +1286,21 @@ namespace OpenSim.Region.ScriptEngine.Common { m_host.AddScriptLPS(1); //No energy force yet - + if (force.x > 20000) force.x = 20000; if (force.y > 20000) force.y = 20000; if (force.z > 20000) force.z = 20000; - + if (local == 1) { m_host.ApplyImpulse(new LLVector3((float)force.x, (float)force.y, (float)force.z), true); } else { - + m_host.ApplyImpulse(new LLVector3((float)force.x,(float)force.y,(float)force.z), false); } } @@ -1475,7 +1475,7 @@ namespace OpenSim.Region.ScriptEngine.Common } // If end is positive, then it directly // corresponds to the lengt of the substring - // needed (plus one of course). BUT, it + // needed (plus one of course). BUT, it // must be within bounds. if (end >= src.Length) { @@ -1493,15 +1493,15 @@ namespace OpenSim.Region.ScriptEngine.Common // Inverted substring (end < start) else { - // Implies both indices are below the - // lower bound. In the inverted case, that + // Implies both indices are below the + // lower bound. In the inverted case, that // means the entire string will be returned // unchanged. if (start < 0) { return src; } - // If both indices are greater than the upper + // If both indices are greater than the upper // bound the result may seem initially counter // intuitive. if (end >= src.Length) @@ -1536,7 +1536,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// /// Delete substring removes the specified substring bounded - /// by the inclusive indices start and end. Indices may be + /// by the inclusive indices start and end. Indices may be /// negative (indicating end-relative) and may be inverted, /// i.e. end < start. /// @@ -1591,7 +1591,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return String.Empty; } - + if (end > 0) { if (start < src.Length) @@ -1616,7 +1616,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } } - + /// /// Insert string inserts the specified string identified by src /// at the index indicated by index. Index may be negative, in @@ -1655,13 +1655,13 @@ namespace OpenSim.Region.ScriptEngine.Common // The index is in bounds. // In this case the index refers to the index that will - // be assigned to the first character of the inserted string. + // be assigned to the first character of the inserted string. // So unlike the other string operations, we do not add one // to get the correct string length. return dest.Substring(0,index)+src+dest.Substring(index); } - + public string llToUpper(string src) { m_host.AddScriptLPS(1); @@ -1767,12 +1767,12 @@ namespace OpenSim.Region.ScriptEngine.Common return; // wiki says, if it's further away then 10m, silently fail. LLVector3 llvel = new LLVector3((float)vel.x, (float)vel.y, (float)vel.z); - + // need the magnitude later float velmag = (float)Util.GetMagnitude(llvel); - + SceneObjectGroup new_group = World.RezObject(inv.Value, llpos, new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param); - + // If either of these are null, then there was an unknown error. if (new_group == null) continue; @@ -1844,7 +1844,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (m_host.TaskInventory[InventorySelf()].PermsGranter != LLUUID.Zero) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[InventorySelf()].PermsGranter); - + if (presence != null) { if ((m_host.TaskInventory[InventorySelf()].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS) != 0) @@ -1871,7 +1871,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (m_host.TaskInventory[InventorySelf()].PermsGranter != LLUUID.Zero) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[InventorySelf()].PermsGranter); - + if (presence != null) { if ((m_host.TaskInventory[InventorySelf()].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS) != 0) @@ -1924,7 +1924,7 @@ namespace OpenSim.Region.ScriptEngine.Common // InstantMessageModule.OnInstantMessage searches through a list of scenes for a client matching the toAgent, // but I don't think we have a list of scenes available from here. // (We also don't want to duplicate the code in OnInstantMessage if we can avoid it.) - + // user is a UUID // TODO: figure out values for client, fromSession, and imSessionID @@ -1991,7 +1991,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } - + public void llSetHoverHeight(double height, int water, double tau) { @@ -2050,7 +2050,7 @@ namespace OpenSim.Region.ScriptEngine.Common if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) { ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); - + if (presence != null) { // Do NOT try to parse LLUUID, animations cannot be triggered by ID @@ -2087,7 +2087,7 @@ namespace OpenSim.Region.ScriptEngine.Common return; ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); - + if (presence != null) { if (animID == LLUUID.Zero) @@ -2194,7 +2194,7 @@ namespace OpenSim.Region.ScriptEngine.Common } ScenePresence presence = World.GetScenePresence(agentID); - + if (presence != null) { string ownerName=resolveName(m_host.ParentGroup.RootPart.OwnerID); @@ -2467,7 +2467,7 @@ namespace OpenSim.Region.ScriptEngine.Common // These functions are supposed to be robust, // so get the state one step at a time. - + if ((item = ScriptByName(name)) != LLUUID.Zero) { if ((sm = m_ScriptEngine.m_ScriptManager) != null) @@ -2480,14 +2480,14 @@ namespace OpenSim.Region.ScriptEngine.Common } } } - } + } // Required by SL if (script == null) ShoutError("llSetScriptState: script "+name+" not found"); - // If we didn't find it, then it's safe to + // If we didn't find it, then it's safe to // assume it is not running. } @@ -2806,23 +2806,23 @@ namespace OpenSim.Region.ScriptEngine.Common /* The new / changed functions were tested with the following LSL script: - + default { state_entry() { rotation rot = llEuler2Rot(<0,70,0> * DEG_TO_RAD); - + llOwnerSay("to get here, we rotate over: "+ (string) llRot2Axis(rot)); llOwnerSay("and we rotate for: "+ (llRot2Angle(rot) * RAD_TO_DEG)); - + // convert back and forth between quaternion <-> vector and angle - + rotation newrot = llAxisAngle2Rot(llRot2Axis(rot),llRot2Angle(rot)); - + llOwnerSay("Old rotation was: "+(string) rot); llOwnerSay("re-converted rotation is: "+(string) newrot); - + llSetRot(rot); // to check the parameters in the prim } } @@ -2832,7 +2832,7 @@ namespace OpenSim.Region.ScriptEngine.Common // Xantor 29/apr/2008 // Returns rotation described by rotating angle radians about axis. - // q = cos(a/2) + i ( x * sin(a/2)) + j (y * sin(a/2)) + k ( z * sin(a/2)) + // q = cos(a/2) + i (x * sin(a/2)) + j (y * sin(a/2)) + k (z * sin(a/2)) public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle) { m_host.AddScriptLPS(1); @@ -2849,7 +2849,7 @@ namespace OpenSim.Region.ScriptEngine.Common // NotImplemented("llAxisAngle2Rot"); } - + // Xantor 29/apr/2008 // converts a Quaternion to X,Y,Z axis rotations public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot) @@ -3264,7 +3264,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// /// The supplied string is scanned for commas /// and converted into a list. Commas are only - /// effective if they are encountered outside + /// effective if they are encountered outside /// of '<' '>' delimiters. Any whitespace /// before or after an element is trimmed. /// @@ -3314,7 +3314,7 @@ namespace OpenSim.Region.ScriptEngine.Common } /// - /// Randomizes the list, be arbitrarily reordering + /// Randomizes the list, be arbitrarily reordering /// sublists of stride elements. As the stride approaches /// the size of the list, the options become very /// limited. @@ -3323,7 +3323,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// This could take a while for very large list /// sizes. /// - + public LSL_Types.list llListRandomize(LSL_Types.list src, int stride) { @@ -3344,7 +3344,7 @@ namespace OpenSim.Region.ScriptEngine.Common // Stride MUST be a factor of the list length // If not, then return the src list. This also // traps those cases where stride > length. - + if (src.Length != stride && src.Length%stride == 0) { chunkk = src.Length/stride; @@ -3384,7 +3384,7 @@ namespace OpenSim.Region.ScriptEngine.Common object[] array = new object[src.Length]; Array.Copy(src.Data, 0, array, 0, src.Length); result = new LSL_Types.list(array); - } + } return result; @@ -3394,10 +3394,10 @@ namespace OpenSim.Region.ScriptEngine.Common /// Elements in the source list starting with 0 and then /// every i+stride. If the stride is negative then the scan /// is backwards producing an inverted result. - /// Only those elements that are also in the specified + /// Only those elements that are also in the specified /// range are included in the result. /// - + public LSL_Types.list llList2ListStrided(LSL_Types.list src, int start, int end, int stride) { @@ -3415,7 +3415,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (end < 0) end = src.Length+end; - // Out of bounds indices are OK, just trim them + // Out of bounds indices are OK, just trim them // accordingly if (start > src.Length) @@ -3429,7 +3429,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (start != end) { - if (start <= end) + if (start <= end) { si[0] = start; ei[0] = end; @@ -3448,8 +3448,8 @@ namespace OpenSim.Region.ScriptEngine.Common // fall within the specified sub-range. The specified // range values are inclusive. // A negative stride reverses the direction of the - // scan producing an inverted list as a result. - + // scan producing an inverted list as a result. + if (stride == 0) stride = 1; @@ -3492,7 +3492,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.list llListInsertList(LSL_Types.list dest, LSL_Types.list src, int index) { - + LSL_Types.list pref = null; LSL_Types.list suff = null; @@ -3539,7 +3539,7 @@ namespace OpenSim.Region.ScriptEngine.Common /// Returns the index of the first occurrence of test /// in src. /// - + public LSL_Types.LSLInteger llListFindList(LSL_Types.list src, LSL_Types.list test) { @@ -3568,7 +3568,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } } - + return index; } @@ -3632,12 +3632,12 @@ namespace OpenSim.Region.ScriptEngine.Common if (LLUUID.TryParse(id,out key)) { ScenePresence presence = World.GetScenePresence(key); - + if (presence != null) { return presence.Name; } - + if (World.GetSceneObjectPart(key) != null) { return World.GetSceneObjectPart(key).Name; @@ -3646,18 +3646,18 @@ namespace OpenSim.Region.ScriptEngine.Common return String.Empty; } - + public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) { m_host.AddScriptLPS(1); Primitive.TextureAnimation pTexAnim = new Primitive.TextureAnimation(); pTexAnim.Flags =(uint) mode; - + //ALL_SIDES if (face == -1) face = 255; - + pTexAnim.Face = (uint)face; pTexAnim.Length = (float)length; pTexAnim.Rate = (float)rate; @@ -3688,7 +3688,7 @@ namespace OpenSim.Region.ScriptEngine.Common LSL_Types.list ret = new LSL_Types.list(); object[] delimiters = new object[separators.Length + spacers.Length]; separators.Data.CopyTo(delimiters, 0); - spacers.Data.CopyTo(delimiters, separators.Length); + spacers.Data.CopyTo(delimiters, separators.Length); bool dfound = false; do { @@ -3735,7 +3735,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_Types.LSLInteger llOverMyLand(string id) { - + m_host.AddScriptLPS(1); LLUUID key = new LLUUID(); if (LLUUID.TryParse(id,out key)) @@ -3790,14 +3790,14 @@ namespace OpenSim.Region.ScriptEngine.Common LLUUID key = new LLUUID(); if (LLUUID.TryParse(id, out key)) - { + { ScenePresence av = World.GetScenePresence(key); - + if (av != null) { if (llAvatarOnSitTarget() == id) { - // if the avatar is sitting on this object, then + // if the avatar is sitting on this object, then // we can unsit them. We don't want random scripts unsitting random people // Lets avoid the popcorn avatar scenario. av.StandUp(); @@ -3809,12 +3809,12 @@ namespace OpenSim.Region.ScriptEngine.Common // if the land is group owned and the object is group owned by the same group // or // if the object is owned by a person with estate access. - + ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y); if (parcel != null) { - if (m_host.ObjectOwner == parcel.landData.ownerID || - (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.groupID + if (m_host.ObjectOwner == parcel.landData.ownerID || + (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.groupID && parcel.landData.isGroupOwned) || World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID)) { av.StandUp(); @@ -3822,7 +3822,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } } - + } } @@ -3928,7 +3928,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); Primitive.ParticleSystem prules = new Primitive.ParticleSystem(); LSL_Types.Vector3 tempv = new LSL_Types.Vector3(); - + float tempf = 0; for (int i = 0; i < rules.Length; i += 2) @@ -3954,7 +3954,7 @@ namespace OpenSim.Region.ScriptEngine.Common case (int)BuiltIn_Commands_BaseClass.PSYS_PART_END_COLOR: tempv = (LSL_Types.Vector3)rules.Data[i + 1]; //prules.PartEndColor = new LLColor(tempv.x,tempv.y,tempv.z,1); - + prules.PartEndColor.R = (float)tempv.x; prules.PartEndColor.G = (float)tempv.y; prules.PartEndColor.B = (float)tempv.z; @@ -3996,7 +3996,7 @@ namespace OpenSim.Region.ScriptEngine.Common // Xantor 03-May-2008 // Wiki: PSYS_SRC_TEXTURE string inventory item name or key of the particle texture - // "" = default texture. + // "" = default texture. case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_TEXTURE: LLUUID tkey = LLUUID.Zero; @@ -4007,11 +4007,11 @@ namespace OpenSim.Region.ScriptEngine.Common } // else try to locate the name in inventory of object. found returns key, // not found returns LLUUID.Zero which will translate to the default particle texture - else + else { prules.Texture = InventoryKey(rules.Data[i+1].ToString()); } - break; + break; case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_BURST_RATE: tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); @@ -4150,7 +4150,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); return m_host.GetAvatarOnSitTarget().ToString(); //LLUUID AVID = m_host.GetAvatarOnSitTarget(); - + //if (AVID != LLUUID.Zero) // return AVID.ToString(); //else @@ -4283,7 +4283,7 @@ namespace OpenSim.Region.ScriptEngine.Common // These functions are supposed to be robust, // so get the state one step at a time. - + if ((item = ScriptByName(name)) != LLUUID.Zero) if ((sm = m_ScriptEngine.m_ScriptManager) != null) sm.ResetScript(m_localID, item); @@ -4293,7 +4293,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (script == null) ShoutError("llResetOtherScript: script "+name+" not found"); - // If we didn't find it, then it's safe to + // If we didn't find it, then it's safe to // assume it is not running. } @@ -4307,7 +4307,7 @@ namespace OpenSim.Region.ScriptEngine.Common // These functions are supposed to be robust, // so get the state one step at a time. - + if ((item = ScriptByName(name)) != LLUUID.Zero) { if ((sm = m_ScriptEngine.m_ScriptManager) != null) @@ -4324,7 +4324,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (script == null) ShoutError("llGetScriptState: script "+name+" not found"); - // If we didn't find it, then it's safe to + // If we didn't find it, then it's safe to // assume it is not running. return 0; @@ -4586,7 +4586,7 @@ namespace OpenSim.Region.ScriptEngine.Common { return; } - + if (landowner != m_host.ObjectOwner) { return; @@ -4857,7 +4857,7 @@ namespace OpenSim.Region.ScriptEngine.Common case 21: // PRIM_FLEXIBLE PrimitiveBaseShape shape = m_host.Shape; - + if (shape.FlexiEntry) res.Add(new LSL_Types.LSLInteger(1)); // active else @@ -4885,7 +4885,7 @@ namespace OpenSim.Region.ScriptEngine.Common case 23: // PRIM_POINT_LIGHT: shape = m_host.Shape; - + if (shape.LightEntry) res.Add(new LSL_Types.LSLInteger(1)); // active else @@ -4932,12 +4932,12 @@ namespace OpenSim.Region.ScriptEngine.Common // // // Each point in a base-64 string represents - // a 6 bit value. A 32-bit integer can be + // a 6 bit value. A 32-bit integer can be // represented using 6 characters (with some - // redundancy). + // redundancy). // // - // LSL requires a base64 string to be 8 + // LSL requires a base64 string to be 8 // characters in length. LSL also uses '/' // rather than '-' (MIME compliant). // @@ -4948,7 +4948,7 @@ namespace OpenSim.Region.ScriptEngine.Common // // SL do not record any kind of exception for // these functions, so the string to integer - // conversion returns '0' if an invalid + // conversion returns '0' if an invalid // character is encountered during conversion. // // @@ -4962,13 +4962,13 @@ namespace OpenSim.Region.ScriptEngine.Common // // // - + // // Table for converting 6-bit integers into // base-64 characters // - private static readonly char[] i2ctable = + private static readonly char[] i2ctable = { 'A','B','C','D','E','F','G','H', 'I','J','K','L','M','N','O','P', @@ -4992,7 +4992,7 @@ namespace OpenSim.Region.ScriptEngine.Common { -1,-1,-1,-1,-1,-1,-1,-1, // 0x -1,-1,-1,-1,-1,-1,-1,-1, - -1,-1,-1,-1,-1,-1,-1,-1, // 1x + -1,-1,-1,-1,-1,-1,-1,-1, // 1x -1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1, // 2x -1,-1,-1,63,-1,-1,-1,64, @@ -5070,25 +5070,25 @@ namespace OpenSim.Region.ScriptEngine.Common // length strings return zero. // // - // Returns an integer representing the - // encoded value providedint he 1st 6 + // Returns an integer representing the + // encoded value providedint he 1st 6 // characters of the string. // // // This is coded to behave like LSL's // implementation (I think), based upon the // information available at the Wiki. - // If more than 8 characters are supplied, + // If more than 8 characters are supplied, // zero is returned. // If a NULL string is supplied, zero will // be returned. // If fewer than 6 characters are supplied, then - // the answer will reflect a partial + // the answer will reflect a partial // accumulation. // - // The 6-bit segments are - // extracted left-to-right in big-endian mode, - // which means that segment 6 only contains the + // The 6-bit segments are + // extracted left-to-right in big-endian mode, + // which means that segment 6 only contains the // two low-order bits of the 32 bit integer as // its high order 2 bits. A short string therefore // means loss of low-order information. E.g. @@ -5126,39 +5126,39 @@ namespace OpenSim.Region.ScriptEngine.Common return digit<0?(int)0:number; } number += --digit<<26; - + if ((digit=c2itable[str[1]])<=0) { return digit<0?(int)0:number; } number += --digit<<20; - + if ((digit=c2itable[str[2]])<=0) { return digit<0?(int)0:number; } number += --digit<<14; - + if ((digit=c2itable[str[3]])<=0) { return digit<0?(int)0:number; } number += --digit<<8; - + if ((digit=c2itable[str[4]])<=0) { return digit<0?(int)0:number; } number += --digit<<2; - + if ((digit=c2itable[str[5]])<=0) { return digit<0?(int)0:number; } number += --digit>>4; - + // ignore trailing padding - + return number; } @@ -5182,8 +5182,8 @@ namespace OpenSim.Region.ScriptEngine.Common // // Scan the string supplied in 'src' and - // tokenize it based upon two sets of - // tokenizers provided in two lists, + // tokenize it based upon two sets of + // tokenizers provided in two lists, // separators and spacers. // // @@ -5196,38 +5196,38 @@ namespace OpenSim.Region.ScriptEngine.Common // Both separators and spacers may be arbitrarily // long strings. i.e. ":::". // - // The function returns an ordered list + // The function returns an ordered list // representing the tokens found in the supplied // sources string. If two successive tokenizers // are encountered, then a NULL entry is added // to the list. // - // It is a precondition that the source and + // It is a precondition that the source and // toekizer lisst are non-null. If they are null, - // then a null pointer exception will be thrown + // then a null pointer exception will be thrown // while their lengths are being determined. // // A small amount of working memoryis required // of approximately 8*#tokenizers. // - // There are many ways in which this function - // can be implemented, this implementation is + // There are many ways in which this function + // can be implemented, this implementation is // fairly naive and assumes that when the // function is invooked with a short source // string and/or short lists of tokenizers, then // performance will not be an issue. // - // In order to minimize the perofrmance + // In order to minimize the perofrmance // effects of long strings, or large numbers // of tokeizers, the function skips as far as - // possible whenever a toekenizer is found, + // possible whenever a toekenizer is found, // and eliminates redundant tokenizers as soon // as is possible. // // The implementation tries to avoid any copying // of arrays or other objects. // - + public LSL_Types.list llParseStringKeepNulls(string src, LSL_Types.list separators, LSL_Types.list spacers) { int beginning = 0; @@ -5256,7 +5256,7 @@ namespace OpenSim.Region.ScriptEngine.Common active[i] = true; offset[mlen] = srclen; - + while (beginning < srclen) { @@ -5270,7 +5270,7 @@ namespace OpenSim.Region.ScriptEngine.Common { // scan all of the markers if ((offset[j] = src.IndexOf((string)separray[j],beginning)) == -1) - { + { // not present at all active[j] = false; } @@ -5278,7 +5278,7 @@ namespace OpenSim.Region.ScriptEngine.Common { // present and correct if (offset[j] < offset[best]) - { + { // closest so far best = j; if (offset[best] == beginning) @@ -5293,19 +5293,19 @@ namespace OpenSim.Region.ScriptEngine.Common if (offset[best] != beginning) { for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) - { + { if (active[j]) { // scan all of the markers if ((offset[j] = src.IndexOf((string)spcarray[j-seplen],beginning)) == -1) - { + { // not present at all active[j] = false; } else { // present and correct if (offset[j] < offset[best]) - { + { // closest so far best = j; } @@ -5317,7 +5317,7 @@ namespace OpenSim.Region.ScriptEngine.Common // This is the normal exit from the scanning loop if (best == mlen) - { + { // no markers were found on this pass // so we're pretty much done tokens.Add(src.Substring(beginning, srclen-beginning)); @@ -5478,7 +5478,7 @@ namespace OpenSim.Region.ScriptEngine.Common //should be similar to : llInstantMessage(llGetOwner(),msg) // llGetOwner ==> m_host.ObjectOwner.ToString() llInstantMessage(m_host.ObjectOwner.ToString(),msg); - + //World.SimChat(Helpers.StringToField(msg), ChatTypeEnum.Owner, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID); //IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); //wComm.DeliverMessage(ChatTypeEnum.Owner, 0, m_host.Name, m_host.UUID, msg); @@ -5509,19 +5509,19 @@ namespace OpenSim.Region.ScriptEngine.Common /// /// illListReplaceList removes the sub-list defined by the inclusive indices - /// start and end and inserts the src list in its place. The inclusive + /// start and end and inserts the src list in its place. The inclusive /// nature of the indices means that at least one element must be deleted /// if the indices are within the bounds of the existing list. I.e. 2,2 /// will remove the element at index 2 and replace it with the source /// list. Both indices may be negative, with the usual interpretation. An - /// interesting case is where end is lower than start. As these indices + /// interesting case is where end is lower than start. As these indices /// bound the list to be removed, then 0->end, and start->lim are removed /// and the source list is added as a suffix. /// public LSL_Types.list llListReplaceList(LSL_Types.list dest, LSL_Types.list src, int start, int end) { - + LSL_Types.list pref = null; m_host.AddScriptLPS(1); @@ -5542,9 +5542,9 @@ namespace OpenSim.Region.ScriptEngine.Common // list. if (start <= end) { - // If greater than zero, then there is going to be a - // surviving prefix. Otherwise the inclusive nature - // of the indices mean that we're going to add the + // If greater than zero, then there is going to be a + // surviving prefix. Otherwise the inclusive nature + // of the indices mean that we're going to add the // source list as a prefix. if (start > 0) { @@ -5580,7 +5580,7 @@ namespace OpenSim.Region.ScriptEngine.Common } // Finally, if start > end, we strip away a prefix and // a suffix, to leave the list that sits ens - // and start, and then tag on the src list. AT least + // and start, and then tag on the src list. AT least // that's my interpretation. We can get sublist to do // this for us. Note that one, or both of the indices // might have been negative. @@ -6084,7 +6084,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (LLUUID.TryParse(id, out key)) { ScenePresence av = World.GetScenePresence(key); - + if (av != null) { foreach (object o in args.Data) @@ -6103,7 +6103,7 @@ namespace OpenSim.Region.ScriptEngine.Common case "4": ret.Add(new LSL_Types.Quaternion((double)av.Rotation.x, (double)av.Rotation.y, (double)av.Rotation.z, (double)av.Rotation.w)); break; - case "5": + case "5": ret.Add(new LSL_Types.Vector3(av.Velocity.X,av.Velocity.Y,av.Velocity.Z)); break; case "6": diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index e031c01..c8c51f8 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -493,7 +493,7 @@ namespace OpenSim.Region.ScriptEngine.Common // now, this makes the math easier int remove=end+1-start; - + ret=new Object[m_data.Length-remove]; if (ret.Length == 0) return new list(ret); @@ -519,7 +519,7 @@ namespace OpenSim.Region.ScriptEngine.Common // NOTE that either index may still be negative after // adding the length, so we must take additional // measures to protect against this. Note also that - // after normalisation the negative indices are no + // after normalisation the negative indices are no // longer relative to the end of the list. if (start < 0) @@ -533,7 +533,7 @@ namespace OpenSim.Region.ScriptEngine.Common } // The conventional case is start <= end - // NOTE that the case of an empty list is + // NOTE that the case of an empty list is // dealt with by the initial test. Start // less than end is taken to be the most // common case. @@ -553,7 +553,7 @@ namespace OpenSim.Region.ScriptEngine.Common { end = m_data.Length - 1; } - + // Sublist still starts before the beginning of the list if (start < 0) { @@ -561,7 +561,7 @@ namespace OpenSim.Region.ScriptEngine.Common } ret = new object[end - start + 1]; - + Array.Copy(m_data, start, ret, 0, end - start + 1); return new list(ret); @@ -580,7 +580,7 @@ namespace OpenSim.Region.ScriptEngine.Common { result = new list(); // If start is still negative, then the whole of - // the existing list is returned. This case is + // the existing list is returned. This case is // only admitted if end is also still negative. if (start < 0) { @@ -593,7 +593,7 @@ namespace OpenSim.Region.ScriptEngine.Common result = GetSublist(0,end); } - // If start is outside of list, then just return + // If start is outside of list, then just return // the prefix, whatever it is. if (start >= m_data.Length) { @@ -896,7 +896,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } - #endregion + #endregion public string ToPrettyString() { @@ -962,7 +962,7 @@ namespace OpenSim.Region.ScriptEngine.Common } // - // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :) + // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :) // public struct StringTest @@ -1103,7 +1103,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } - + static public implicit operator String(LSLString s) { @@ -1267,7 +1267,7 @@ namespace OpenSim.Region.ScriptEngine.Common i.value++; return i; } - + public static LSLInteger operator --(LSLInteger i) { diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs index 2b6f6d9..03d3a41 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs @@ -268,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.Common return 0; } } - + public double osTerrainGetHeight(int x, int y) { m_host.AddScriptLPS(1); @@ -448,7 +448,7 @@ namespace OpenSim.Region.ScriptEngine.Common } } - //Texture draw functions + //Texture draw functions public string osMovePen(string drawList, int x, int y) { m_host.AddScriptLPS(1); diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs index 2d58b57..aa9c8c7 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs @@ -60,7 +60,7 @@ namespace OpenSim.Region.ScriptEngine.Common string osSetPenSize(string drawList, int penSize); string osSetPenColour(string drawList, string colour); string osDrawImage(string drawList, int width, int height, string imageUrl); - void osSetStateEvents(int events); + void osSetStateEvents(int events); } } diff --git a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs index f438120..335d1a0 100644 --- a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,7 +54,7 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs index f3af621..2a0ed37 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase Thread.Sleep(cmdHandlerThreadCycleSleepms); //lock (ScriptEngine.ScriptEngines) //{ - foreach (ScriptEngine se in new ArrayList(ScriptEngine.ScriptEngines)) + foreach (ScriptEngine se in new ArrayList(ScriptEngine.ScriptEngines)) { se.m_ASYNCLSLCommandManager.DoOneCmdHandlerPass(); } @@ -176,7 +176,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase #region Check llRemoteData channels - + #endregion #region Check llListeners diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs index 4311836..13c9d25 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs @@ -218,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin objtype |= 0x04; // passive non-moving else objtype |= 0x02; // active moving - if (ent is IScript) objtype |= 0x08; // Scripted. It COULD have one hidden ... + if (ent is IScript) objtype |= 0x08; // Scripted. It COULD have one hidden ... if (((ts.type & objtype) != 0) || ((ts.type & objtype) == ts.type)) { diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs index 141e471..6f88e11 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs @@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin } } - // Old method: Create new list + // Old method: Create new list //List NewTimers = new List(); //foreach (TimerClass ts in Timers) //{ diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 715e465..fc005ab 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// public class MaintenanceThread : iScriptEngineFunctionModule { - + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //public ScriptEngine m_ScriptEngine; @@ -238,6 +238,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // get { return _PleaseShutdown; } // set { _PleaseShutdown = value; } //} - //private bool _PleaseShutdown = false; + //private bool _PleaseShutdown = false; } } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs index a7ad50d..b0c6314 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// /// This is the root object for ScriptEngine. Objects access each other trough this class. /// - /// + /// [Serializable] public abstract class ScriptEngine : IRegionModule, ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule { @@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase #region IRegionModule public abstract void Initialise(Scene scene, IConfigSource config); - + public void PostInitialise() { } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 2233913..c84975a 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase /// Compiles them if necessary /// Execute functions for EventQueueManager (Sends them to script on other AppDomain for execution) /// - /// + /// // This class is as close as you get to the script without being inside script class. It handles all the dirty work for other classes. // * Keeps track of running scripts @@ -212,7 +212,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase if (LUQueue.Count > 0) { LUStruct item = LUQueue.Dequeue(); - + if (item.Action == LUType.Unload) { _StopScript(item.localID, item.itemID); @@ -224,7 +224,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase } } } - + #endregion #region Helper functions diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs index 55a20e7..26892a2 100644 --- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs +++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs @@ -33,7 +33,7 @@ using System.Net.Sockets; namespace OpenSim.Region.ScriptEngine.Common.TRPC { - public class TCPServer: TCPCommon.ServerInterface + public class TCPServer: TCPCommon.ServerInterface { public readonly int LocalPort; public TCPServer(int localPort) diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs index c293ecb..a310978 100644 --- a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs +++ b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Common public delegate void ReceiveCommandDelegate(int ID, string Command, params object[] p); public event ReceiveCommandDelegate ReceiveCommand; Dictionary TypeDictionary = new Dictionary(); - Type[] Types = + Type[] Types = { typeof(String), typeof(Int16), diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index 1d71182..f661162 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs @@ -39,9 +39,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL { public class Compiler { - private static readonly log4net.ILog m_log + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - + // * Uses "LSL2Converter" to convert LSL to C# if necessary. // * Compiles C#-code into an assembly // * Returns assembly name ready for AppDomain load. @@ -278,8 +278,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL if (enableCommanderLSL == true && l == enumCompileType.cs) { - foreach (KeyValuePair com + foreach (KeyValuePair com in m_scriptEngine.World.GetCommanders()) { compileScript = com.Value.GenerateRuntimeAPI() + compileScript; @@ -305,7 +305,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL m_log.Debug("[ScriptEngine.DotNetEngine]: Preparing to compile the following LSL to C# translated code"); m_log.Debug(""); m_log.Debug(compileScript); - + return CompileFromDotNetText(compileScript, l); } @@ -322,7 +322,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL private static string CreateCSCompilerScript(string compileScript) { - + compileScript = String.Empty + "using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;\r\n" + diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index 2100900..1832864 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs @@ -23,7 +23,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* +* */ using System; @@ -32,17 +32,13 @@ using System.Text.RegularExpressions; namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL { - public class LSL2CSConverter { - - // Uses regex to convert LSL code to C# code. //private Regex rnw = new Regex(@"[a-zA-Z0-9_\-]", RegexOptions.Compiled); private Dictionary dataTypes = new Dictionary(); private Dictionary quotes = new Dictionary(); - public LSL2CSConverter() { @@ -72,7 +68,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL Script = Regex.Replace(Script, @"\r\n", "\n"); Script = Regex.Replace(Script, @"\n", "\r\n"); - // QUOTE REPLACEMENT // temporarily replace quotes so we can work our magic on the script without // always considering if we are inside our outside quotes's @@ -86,21 +81,16 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL bool last_was_escape = false; int quote_replaced_count = 0; - - string[] blocked = new string[] {"Axiom","Db4objects","libsecondlife","log4net","Microsoft", "Modified","Mono","MonoXnaCompactMaths","mscorlib","MySql", "NHibernate","Nini","nunit","Ode","OpenSim","PhysX_Wrapper_Dotnet", "PumaCode","RAIL","XMLRPC","System"}; - for (int p = 0; p < blocked.Length;p++) { - Match SecurityM = Regex.Match(Script, "[;}][^\"']+" + blocked[p].Replace(".", "\\.") + "\\.[^\"']", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); if (SecurityM.Success) throw new Exception("CS0103: 'The name '" + blocked[p] + "' does not exist in the current context'"); - } for (int p = 0; p < Script.Length; p++) @@ -166,7 +156,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // END OF QUOTE REPLACEMENT // - // // PROCESS STATES // Remove state definitions and add state names to start of each event within state @@ -194,7 +183,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // if level == 0, add to return if (ilevel == 1 && lastlevel == 0) { - // 0 => 1: Get last + // 0 => 1: Get last Match m = //Regex.Match(cache, @"(?![a-zA-Z_]+)\s*([a-zA-Z_]+)[^a-zA-Z_\(\)]*{", Regex.Match(cache, @"(?![a-zA-Z_]+)\s*(state\s+)?(?[a-zA-Z_][a-zA-Z_0-9]*)[^a-zA-Z_0-9\(\)]*{", @@ -253,7 +242,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL Script = ret; ret = String.Empty; - foreach (string key in dataTypes.Keys) { string val; @@ -291,7 +279,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL Regex.Replace(Script, @"\[([^\]]*)\]", @"new LSL_Types.list($1)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); - // Replace (string) to .ToString() // Script = Regex.Replace(Script, @"\(string\)\s*([a-zA-Z0-9_.]+(\s*\([^\)]*\))?)", @"$1.ToString()", @@ -313,12 +300,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL Script = Script.Replace(key, "\"" + val + "\""); } - - //System.Console.WriteLine(Script); Return = String.Empty;// + //"using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;"; - //Return += String.Empty + // "namespace SecondLife { "; @@ -328,13 +312,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL //Return += @"public Script() { } "; Return += Script; //Return += "} }\r\n"; - + quotes.Clear(); - + return Return; } - } - - } diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs index bce9cfc..799aa92 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,11 +54,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly : AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index ed2c0a3..55289d9 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs @@ -102,7 +102,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine // Fire the first start-event int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); - m_host.SetScriptEvents(itemID, eventFlags); + m_host.SetScriptEvents(itemID, eventFlags); m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); } catch (Exception e) // LEGIT: User Scripting diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs index 0208350..f53772e 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs @@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); //ConstructorBuilder constructor = typeBuilder.DefineConstructor( // MethodAttributes.Public, - // CallingConventions.Standard, + // CallingConventions.Standard, // new Type[0]); ConstructorBuilder constructor = typeBuilder.DefineConstructor( MethodAttributes.Public | @@ -192,8 +192,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //// Create state object //FieldName = "State"; //FieldBuilder State_fb = typeBuilder.DefineField( - // FieldName, - // typeof(UInt32), + // FieldName, + // typeof(UInt32), // FieldAttributes.Public); //il.Emit(OpCodes.Ldarg_0); //il.Emit(OpCodes.Ldc_I4, 0); @@ -206,8 +206,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //FieldName = "LSL_BuiltIns"; //FieldBuilder LSL_BuiltIns_fb = typeBuilder.DefineField( - // FieldName, - // objType1, + // FieldName, + // objType1, // FieldAttributes.Public); ////LSL_BuiltIn_Commands_TestImplementation _ti = new LSL_BuiltIn_Commands_TestImplementation(); diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs index 1b73311..7805aa3 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs @@ -34,9 +34,9 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO // * // * These are internal "assembly" commands, // * basic operators like "ADD", "PUSH" and "POP" - // * + // * // * It also contains managed stack and keeps track of internal variables, etc. - // * + // * // */ diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs index 06ae1e9..b2a2f25 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs @@ -69,14 +69,12 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO fs.Close(); } - /// /// Parse LSO file. /// public void Parse() { - // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack. - + // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack. // HEADER BLOCK Common.SendToDebug("Reading HEADER BLOCK at: 0"); @@ -156,7 +154,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } Common.SendToDebug("Number of Static Blocks read: " + StaticBlockCount); - // FUNCTION BLOCK // Always right after STATIC BLOCK LSO_Struct.FunctionBlock myFunctionBlock = new LSO_Struct.FunctionBlock(); @@ -186,7 +183,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } } - // STATE FRAME BLOCK // Always right after FUNCTION BLOCK Common.SendToDebug("Reading STATE BLOCK at: " + myHeader.SR); @@ -213,7 +209,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } } - // STATE BLOCK // For each StateFrameBlock there is one StateBlock with multiple event handlers @@ -239,7 +234,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO // We need to count number of bits flagged in EventMask? - // for each bit in myStateFrameBlock.StatePointer[i].EventMask // ADDING TO ALL RIGHT NOW, SHOULD LIMIT TO ONLY THE ONES IN USE @@ -273,7 +267,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } } - //// READ FUNCTION CODE CHUNKS //// Functions + Function start pos (GFR) //// TODO: Somehow be able to identify and reference this @@ -293,7 +286,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO { for (int i = 0; i < myStateFrameBlock.StateCount; i++) { - // TODO: Somehow organize events and functions so they can be found again, + // TODO: Somehow organize events and functions so they can be found again, // two level search ain't no good for (int ii = 0; ii < myStateFrameBlock.StatePointer[i].EventMask.Count - 1; ii++) { @@ -320,7 +313,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO } } - if (Common.IL_CreateFunctionList) IL_INSERT_FUNCTIONLIST(); } @@ -371,7 +363,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //private byte[] br_read_smallendian(int len) //{ - // byte[] bytes = new byte[len]; + // byte[] bytes = new byte[len]; // br.Read(bytes,0, len); // return bytes; //} @@ -459,7 +451,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO Common.SendToDebug("Return type #" + myCodeChunk.ReturnType.ObjectType + ": " + ((LSO_Enums.Variable_Type_Codes) myCodeChunk.ReturnType.ObjectType).ToString()); - // TODO: How to determine number of codechunks -- does this method work? myCodeChunk.CodeChunkArguments = new List(); byte reader = br_read(1)[0]; @@ -492,7 +483,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO // End marker is 0x000 myCodeChunk.EndMarker = reader; - // // Emit: START OF METHOD (FUNCTION) // @@ -515,11 +505,9 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO Common.SendToDebug("CLR:" + eventname + ":ILGenerator il = methodBuilder.GetILGenerator();"); ILGenerator il = methodBuilder.GetILGenerator(); - if (Common.IL_UseTryCatch) IL_INSERT_TRY(il, eventname); - // Push Console.WriteLine command to stack ... Console.WriteLine("Hello World!"); //Common.SendToDebug("CLR:" + eventname + ":il.Emit(OpCodes.Call..."); //il.Emit(OpCodes.Call, typeof(Console).GetMethod @@ -534,7 +522,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO il.Emit(OpCodes.Ldarg, _ic); } - // // CALLING OPCODE PROCESSOR, one command at the time TO GENERATE IL // @@ -544,7 +531,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO FoundRet = LSL_PROCESS_OPCODE(il); } - if (Common.IL_UseTryCatch) IL_INSERT_END_TRY(il, eventname); @@ -558,17 +544,14 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO { Common.SendToDebug("Creating function list"); - string eventname = "GetFunctions"; Common.SendToDebug("Creating IL " + eventname); // Define a private String field. //FieldBuilder myField = myTypeBuilder.DefineField("EventList", typeof(String[]), FieldAttributes.Public); - //FieldBuilder mem = typeBuilder.DefineField("mem", typeof(Array), FieldAttributes.Private); - MethodBuilder methodBuilder = typeBuilder.DefineMethod(eventname, MethodAttributes.Public, typeof (string[]), @@ -579,7 +562,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO ILGenerator il = methodBuilder.GetILGenerator(); - // IL_INSERT_TRY(il, eventname); // // Push string to stack @@ -615,17 +597,14 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //il.Emit(OpCodes.Call, typeof(LSL_BaseClass).GetMethod("AddFunction", new Type[] { typeof(string) })); } - // IL_INSERT_END_TRY(il, eventname); - il.Emit(OpCodes.Ldloc_0); // Load local variable 0 onto stack // il.Emit(OpCodes.Call, typeof(LSL_BaseClass).GetMethod("SetFunctionList", new Type[] { typeof(Array) })); il.Emit(OpCodes.Ret); // Return } - private void IL_INSERT_TRY(ILGenerator il, string eventname) { /* @@ -687,7 +666,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO { Common.SendToDebug("Found cached STATIC BLOCK"); - return StaticBlocks[pos]; } diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs index 78b44a0..5210ff0 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,11 +54,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly : AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs index 20d1a58..617d6f6 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs @@ -92,7 +92,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine // Fire the first start-event int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); - m_host.SetScriptEvents(itemID, eventFlags); + m_host.SetScriptEvents(itemID, eventFlags); m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); } catch (Exception e) // LEGIT - User Script Compilation diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs index 70a84f1..77d9b10 100644 --- a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,11 +54,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly : AssemblyVersion("1.0.0.0")] diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs index c33cfd1..8754516 100644 --- a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer /// /// This is the root object for RemoteServer. Objects access each other trough this class. /// - /// + /// [Serializable] public class ScriptEngine : IRegionModule { diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs index c0fc890..0416779 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs @@ -29,7 +29,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OpenSim.DataStore.DB4o")] @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -52,11 +52,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs index c917e1e..fa0d0b6 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs @@ -142,7 +142,7 @@ namespace OpenSim.DataStore.MSSQL public void RemoveObject(LLUUID obj, LLUUID regionUUID) { m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); - + DataTable prims = ds.Tables["prims"]; DataTable shapes = ds.Tables["primshapes"]; @@ -332,7 +332,7 @@ namespace OpenSim.DataStore.MSSQL /*********************************************************************** * * Database Definition Functions - * + * * This should be db agnostic as we define them in ADO.NET terms * **********************************************************************/ @@ -460,7 +460,7 @@ namespace OpenSim.DataStore.MSSQL } /*********************************************************************** - * + * * Convert between ADO.NET <=> OpenSim Objects * * These should be database independant @@ -650,7 +650,7 @@ namespace OpenSim.DataStore.MSSQL s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]); // text TODO: this isn't right] = but I'm not sure the right - // way to specify this as a blob atm + // way to specify this as a blob atm byte[] textureEntry = (byte[]) row["Texture"]; s.TextureEntry = textureEntry; @@ -695,7 +695,7 @@ namespace OpenSim.DataStore.MSSQL // way to specify this as a blob atm // And I couldn't work out how to save binary data either - // seems that the texture colum is being treated as a string in the Datarow + // seems that the texture colum is being treated as a string in the Datarow // if you do a .getType() on it, it returns string, while the other columns return correct type // MW[10-08-07] // Added following xml hack but not really ideal , also ExtraParams isn't currently part of the database @@ -738,7 +738,7 @@ namespace OpenSim.DataStore.MSSQL fillShapeRow(shapeRow, prim); } } - + // see IRegionDatastore public void StorePrimInventory(LLUUID primID, ICollection items) { @@ -868,7 +868,7 @@ namespace OpenSim.DataStore.MSSQL /// This is a convenience function that collapses 5 repetitive /// lines for defining SqlParameters to 2 parameters: /// column name and database type. - /// + /// /// It assumes certain conventions like :param as the param /// name to replace in parametrized queries, and that source /// version is always current version, both of which are fine -- cgit v1.1