From 64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 13 Jun 2008 00:21:53 +0000 Subject: Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers. --- OpenSim/Data/Migration.cs | 23 +++++++---- OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +- OpenSim/Data/MySQL/MySQLUserData.cs | 2 +- OpenSim/Framework/MessageServerConfig.cs | 4 +- OpenSim/Framework/Servers/BaseOpenSimServer.cs | 22 +++++------ .../Modules/World/Serialiser/SceneXmlLoader.cs | 4 +- .../Modules/World/WorldMap/WorldMapModule.cs | 6 +-- OpenSim/Region/Environment/Scenes/InnerScene.cs | 8 ++-- OpenSim/Region/Environment/Scenes/Scene.cs | 46 ++++++---------------- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 25 +++++------- .../ScriptEngine/XEngine/LSL_ScriptCommands.cs | 26 ++++++------ 11 files changed, 74 insertions(+), 94 deletions(-) diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index 54d4970..d23200c 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs @@ -129,9 +129,12 @@ namespace OpenSim.Data cmd.CommandText = kvp.Value; cmd.ExecuteNonQuery(); - if (version == 0) { + if (version == 0) + { InsertVersion(_type, newversion); - } else { + } + else + { UpdateVersion(_type, newversion); } version = newversion; @@ -149,7 +152,7 @@ namespace OpenSim.Data if (m.Success) { int MigrationVersion = int.Parse(m.Groups[1].ToString()); - if ( MigrationVersion > max ) + if (MigrationVersion > max) max = MigrationVersion; } } @@ -160,9 +163,12 @@ namespace OpenSim.Data { get { return FindVersion(_type); } set { - if (Version < 1) { + if (Version < 1) + { InsertVersion(_type, value); - } else { + } + else + { UpdateVersion(_type, value); } } @@ -172,7 +178,8 @@ namespace OpenSim.Data { int version = 0; DbCommand cmd = _conn.CreateCommand(); - try { + try + { cmd.CommandText = "select version from migrations where name='" + type + "' limit 1"; using (IDataReader reader = cmd.ExecuteReader()) { @@ -182,7 +189,9 @@ namespace OpenSim.Data } reader.Close(); } - } catch { + } + catch + { // Something went wrong, so we're version 0 } return version; diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 780b96f..de0826f 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -132,7 +132,7 @@ namespace OpenSim.Data.MySQL // if there are no tables, get out of here and let // migrations do their job - if( + if ( tableList["inventoryfolders"] == null && tableList["inventoryitems"] == null ) diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index 279ff71..05874f8 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -138,7 +138,7 @@ namespace OpenSim.Data.MySQL // if there are no tables, get out of here and let // migrations do their job - if( + if ( tableList[m_agentsTableName] == null && tableList[m_usersTableName] == null && tableList[m_userFriendsTableName] == null && diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs index b7a51bc..5e1daee 100644 --- a/OpenSim/Framework/MessageServerConfig.cs +++ b/OpenSim/Framework/MessageServerConfig.cs @@ -63,7 +63,7 @@ namespace OpenSim.Framework configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", - "http://127.0.0.1:8002" + "/", false); + "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false); configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, @@ -71,7 +71,7 @@ namespace OpenSim.Framework configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", - "http://127.0.0.1:8001/", false); + "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false); configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false); configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index a273676..433b040 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -47,14 +47,14 @@ namespace OpenSim.Framework.Servers /// server. /// private Timer m_periodicLogStatsTimer = new Timer(60 * 60 * 1000); - + protected ConsoleBase m_console; /// /// Time at which this server was started /// protected DateTime m_startuptime; - + /// /// Record the initial startup directory for info purposes /// @@ -80,11 +80,11 @@ namespace OpenSim.Framework.Servers { m_startuptime = DateTime.Now; m_version = VersionInfo.Version; - - m_periodicLogStatsTimer.Elapsed += new ElapsedEventHandler(LogStats); + + m_periodicLogStatsTimer.Elapsed += new ElapsedEventHandler(LogStats); m_periodicLogStatsTimer.Enabled = true; } - + /// /// Print statistics to the logfile, if they are active /// @@ -93,7 +93,7 @@ namespace OpenSim.Framework.Servers if (m_stats != null) { m_log.Info(m_stats.Report()); - } + } } /// @@ -131,10 +131,10 @@ namespace OpenSim.Framework.Servers Notice("quit - equivalent to shutdown."); Notice("show info - show server information (e.g. startup path)."); - + if (m_stats != null) Notice("show stats - show statistical information for this server"); - + Notice("show uptime - show server startup time and uptime."); Notice("show version - show server version."); Notice("shutdown - shutdown the server.\n"); @@ -165,9 +165,9 @@ namespace OpenSim.Framework.Servers { case "info": Notice("Version: " + m_version ); - Notice("Startup directory: " + m_startupDirectory); + Notice("Startup directory: " + m_startupDirectory); break; - + case "stats": if (m_stats != null) { @@ -255,7 +255,7 @@ namespace OpenSim.Framework.Servers { OSString = Util.ReadEtcIssue(); } - + if (OSString.Length > 45) { OSString = OSString.Substring(0, 45); diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs index 54538d8..69f1902 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs @@ -193,8 +193,8 @@ namespace OpenSim.Region.Environment.Scenes /// protected static void CreatePrimFromXml2(Scene scene, string xmlData) { - SceneObjectGroup obj = new SceneObjectGroup(xmlData); - + SceneObjectGroup obj = new SceneObjectGroup(xmlData); + LLVector3 receivedVelocity = obj.RootPart.Velocity; //System.Console.WriteLine(obj.RootPart.Velocity.ToString()); scene.AddSceneObjectFromStorage(obj); diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs index 041af2b..ebcb440 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs @@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap { bool lookup = false; - lock(cachedMapBlocks) + lock (cachedMapBlocks) { if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch())) { @@ -157,7 +157,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap mapBlocks = m_scene.CommsManager.GridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8); avatarPresence.ControllingClient.SendMapBlock(mapBlocks); - lock(cachedMapBlocks) + lock (cachedMapBlocks) cachedMapBlocks = mapBlocks; cachedTime = Util.UnixTimeSinceEpoch(); @@ -236,4 +236,4 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap remoteClient.SendMapBlock(mapBlocks); } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index d09efd8..9bbfc3d 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -193,7 +193,7 @@ namespace OpenSim.Region.Environment.Scenes { sceneObject.RegionHandle = m_regInfo.RegionHandle; sceneObject.SetScene(m_parentScene); - + foreach (SceneObjectPart part in sceneObject.Children.Values) { part.LocalId = m_parentScene.PrimIDAllocate(); @@ -209,7 +209,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// /// - /// If true, the object is made persistent into the scene. + /// If true, the object is made persistent into the scene. /// If false, the object will not persist over server restarts /// /// true if the object was added, false if an object with the same uuid was already in the scene @@ -223,9 +223,9 @@ namespace OpenSim.Region.Environment.Scenes // QuadTree.AddSceneObject(sceneObject); Entities.Add(sceneObject.UUID, sceneObject); m_numPrim += sceneObject.Children.Count; - + if (attachToBackup) - sceneObject.AttachToBackup(); + sceneObject.AttachToBackup(); return true; } diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 95d6f1f..e70fbe2 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -998,7 +998,7 @@ namespace OpenSim.Region.Environment.Scenes // Cannot create a map for a nonexistant heightmap yet. if (Heightmap == null) return; - + if (terrain == null) { int tc = System.Environment.TickCount; @@ -1122,12 +1122,9 @@ namespace OpenSim.Region.Environment.Scenes mapbmp.SetPixel(x, (256 - y) - 1, black); } } - } //} - - //tc = System.Environment.TickCount - tc; //m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms"); } @@ -1135,7 +1132,6 @@ namespace OpenSim.Region.Environment.Scenes bool drawPrimVolume = true; - try { IConfig startupConfig = m_config.Configs["Startup"]; @@ -1145,7 +1141,6 @@ namespace OpenSim.Region.Environment.Scenes { m_log.Warn("Failed to load StarupConfg"); } - if (drawPrimVolume) { @@ -1168,8 +1163,8 @@ namespace OpenSim.Region.Environment.Scenes // Draw if the object is at least 1 meter wide in any direction if (part.Scale.X > 1f || part.Scale.Y > 1f || part.Scale.Z > 1f) { - // Try to get the RGBA of the default texture entry.. - // + // Try to get the RGBA of the default texture entry.. + // try { LLColor texcolor = part.Shape.Textures.DefaultTexture.RGBA; @@ -1177,9 +1172,7 @@ namespace OpenSim.Region.Environment.Scenes int colorg = 255 - (int)(texcolor.G * 255f); int colorb = 255 - (int)(texcolor.B * 255f); - if (colorr == 255 && colorg == 255 && colorb == 255) - { } - else + if (!(colorr == 255 && colorg == 255 && colorb == 255)) { //Try to set the map spot color try @@ -1248,10 +1241,9 @@ namespace OpenSim.Region.Environment.Scenes || mapdrawendY > 255) continue; - int wy = 0; - bool breakYN = false; // If we run into an error drawing, break out of the + bool breakYN = false; // If we run into an error drawing, break out of the // loop so we don't lag to death on error handling for (int wx = mapdrawstartX; wx < mapdrawendX; wx++) { @@ -1274,7 +1266,7 @@ namespace OpenSim.Region.Environment.Scenes if (breakYN) break; - } + } } // Object is within 256m Z of terrain } // object is at least a meter wide } // loop over group children @@ -1304,7 +1296,6 @@ namespace OpenSim.Region.Environment.Scenes asset.Type = 0; asset.Temporary = temporary; AssetCache.AddAsset(asset); - } else { @@ -1322,7 +1313,6 @@ namespace OpenSim.Region.Environment.Scenes AssetCache.AddAsset(asset); } } - } #endregion @@ -1442,10 +1432,8 @@ namespace OpenSim.Region.Environment.Scenes // Un-offset the prim (it gets offset later by the consumer method) pos.Z -= 0.25F; - } - return pos; } else @@ -1523,7 +1511,7 @@ namespace OpenSim.Region.Environment.Scenes // case... other tree types // tree.Scale = new LLVector3(?, ?, ?); // break; - + default: tree.Scale = new LLVector3(4, 4, 4); break; @@ -1557,7 +1545,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// /// - /// If true, the object is made persistent into the scene. + /// If true, the object is made persistent into the scene. /// If false, the object will not persist over server restarts /// public void AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) @@ -1889,11 +1877,9 @@ 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; - client.OnCreateNewInventoryItem += CreateNewInventoryItem; client.OnCreateNewInventoryFolder += CommsManager.UserProfileCacheService.HandleCreateInventoryFolder; client.OnUpdateInventoryFolder += CommsManager.UserProfileCacheService.HandleUpdateInventoryFolder; @@ -1907,29 +1893,23 @@ namespace OpenSim.Region.Environment.Scenes client.OnRemoveInventoryItem += RemoveInventoryItem; client.OnRemoveInventoryFolder += RemoveInventoryFolder; client.OnRezScript += RezScript; - client.OnRequestTaskInventory += RequestTaskInventory; client.OnRemoveTaskItem += RemoveTaskInventory; client.OnUpdateTaskInventory += UpdateTaskInventory; client.OnMoveTaskItem += MoveTaskInventoryItem; - client.OnGrabObject += ProcessObjectGrab; client.OnDeGrabObject += ProcessObjectDeGrab; client.OnMoneyTransferRequest += ProcessMoneyTransferRequest; client.OnParcelBuy += ProcessParcelBuy; client.OnAvatarPickerRequest += ProcessAvatarPickerRequest; client.OnPacketStats += AddPacketStats; - client.OnObjectIncludeInSearch += m_innerScene.MakeObjectSearchable; - client.OnTeleportHomeRequest += TeleportClientHome; - client.OnSetStartLocationRequest += SetHomeRezPoint; client.OnUndo += m_innerScene.HandleUndo; client.OnObjectGroupRequest += m_innerScene.HandleObjectGroupUpdate; client.OnParcelReturnObjectsRequest += LandChannel.ReturnObjectsInParcel; client.OnScriptReset += ProcessScriptReset; - // EventManager.TriggerOnNewClient(client); } @@ -1947,8 +1927,8 @@ namespace OpenSim.Region.Environment.Scenes } 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) + LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, + bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) { LLVector3 pos; const bool frontFacesOnly = true; @@ -1958,7 +1938,6 @@ namespace OpenSim.Region.Environment.Scenes if (target != null && target2 != null) { - 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); @@ -1991,10 +1970,9 @@ namespace OpenSim.Region.Environment.Scenes ScaleOffset = Math.Abs(ScaleOffset); LLVector3 intersectionpoint = new LLVector3(ei.ipoint.x, ei.ipoint.y, ei.ipoint.z); LLVector3 normal = new LLVector3(ei.normal.x, ei.normal.y, ei.normal.z); - LLVector3 offset = (normal * (ScaleOffset / 2f)); - pos = (intersectionpoint + offset); + LLVector3 offset = normal * (ScaleOffset / 2f); + pos = intersectionpoint + offset; - // stick in offset format from the original prim pos = pos - target.ParentGroup.AbsolutePosition; if (CopyRotates) diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 2774a45..f6dc8a2 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -418,7 +418,7 @@ namespace OpenSim.Region.Environment.Scenes RegisterToEvents(); SetDirectionVectors(); - + } public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams, @@ -481,8 +481,6 @@ namespace OpenSim.Region.Environment.Scenes // } } - - public uint GenerateClientFlags(LLUUID ObjectID) { return m_scene.ExternalChecks.ExternalChecksGenerateClientFlags(m_uuid, ObjectID); @@ -590,27 +588,27 @@ namespace OpenSim.Region.Environment.Scenes // m_log.DebugFormat( // "[SCENE PRESENCE]: Upgrading child agent {0}, {1} to a root agent in {2} at pos {3}", // Name, UUID, m_scene.RegionInfo.RegionName, pos); - + if (pos.X < 0 || pos.X > Constants.RegionSize || pos.Y < 0 || pos.Y > Constants.RegionSize || pos.Z < 0) { LLVector3 emergencyPos = new LLVector3(128, 128, 128); - + m_log.WarnFormat( - "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}", + "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}", pos, Name, UUID, emergencyPos); - + pos = emergencyPos; - } + } m_isChildAgent = false; - + float localAVHeight = 1.56f; if (m_avHeight != 127.0f) { localAVHeight = m_avHeight; } - float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y); + float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y); float newPosZ = posZLimit + localAVHeight; if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) { @@ -789,7 +787,7 @@ namespace OpenSim.Region.Environment.Scenes // Must check for standing up even when PhysicsActor is null, // since sitting currently removes avatar from physical scene //m_log.Debug("agentPos:" + AbsolutePosition.ToString()); - + // This is irritating. Really. if (!AbsolutePosition.IsFinite()) { @@ -969,8 +967,6 @@ namespace OpenSim.Region.Environment.Scenes } } - - m_scene.EventManager.TriggerOnClientMovement(this); m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); @@ -1006,7 +1002,6 @@ namespace OpenSim.Region.Environment.Scenes //m_log.Debug("[AUTOPILOT]: " + Util.GetDistanceTo(AbsolutePosition, m_autoPilotTarget).ToString()); if (Util.GetDistanceTo(AbsolutePosition, m_autoPilotTarget) <= 1.5) { - if (m_sitAtAutoTarget) { SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetUUID); @@ -2140,7 +2135,6 @@ namespace OpenSim.Region.Environment.Scenes m_log.Info("[CLIENT]: Couldn't save attachments. :("); } m_attachments.Clear(); - } } lock (m_knownPrimUUID) @@ -2204,7 +2198,6 @@ namespace OpenSim.Region.Environment.Scenes m_attachmentsTransported = true; lock (m_attachments) { - foreach (SceneObjectGroup gobj in m_attachments) { // If the prim group is null then something must have happened to it! diff --git a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs index b18c867..d901c21 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs @@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine public void llSay(int channelID, string text) { m_host.AddScriptLPS(1); - + if (text.Length > 1023) text = text.Substring(0, 1023); @@ -176,7 +176,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine /// - /// accepts a valid LLUUID, -or- a name of an inventory item. + /// accepts a valid LLUUID, -or- a name of an inventory item. /// Returns a valid LLUUID or LLUUID.Zero if key invalid and item not found /// in prim inventory. /// @@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine public void llWhisper(int channelID, string text) { m_host.AddScriptLPS(1); - + if (text.Length > 1023) text = text.Substring(0, 1023); @@ -444,7 +444,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine public void llShout(int channelID, string text) { m_host.AddScriptLPS(1); - + if (text.Length > 1023) text = text.Substring(0, 1023); @@ -920,7 +920,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine } } - private void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, + private void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, float wind, float tension, LSL_Types.Vector3 Force) { if (part == null) @@ -933,7 +933,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine { needs_fakedelete = true; } - part.Shape.FlexiEntry = true; // this setting flexi true isn't working, but the below parameters do + part.Shape.FlexiEntry = true; // this setting flexi true isn't working, but the below parameters do // work once the prim is already flexi part.Shape.FlexiSoftness = softness; part.Shape.FlexiGravity = gravity; @@ -1482,7 +1482,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine m_host.Sound = LLUUID.Zero; m_host.SoundGain = 0; m_host.SoundFlags = 0; - m_host.SoundRadius = 0; + m_host.SoundRadius = 0; m_host.ScheduleFullUpdate(); m_host.SendFullUpdateToAllClients(); @@ -4542,7 +4542,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine v=new LSL_Types.Vector3(rules.Data[idx++].ToString()); SetScale(part, v); - + break; case 8: // PRIM_ROTATION if (remain < 1) @@ -4605,7 +4605,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine float intensity = (float)Convert.ToDouble(rules.Data[idx++]); float radius = (float)Convert.ToDouble(rules.Data[idx++]); float falloff = (float)Convert.ToDouble(rules.Data[idx++]); - + SetPointLight(part, (light == 1), lightcolor, intensity, radius, falloff); break; @@ -5514,7 +5514,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine IConfigSource config = new IniConfigSource(Application.iniFilePath); if (config.Configs["XEngine"] == null) config.AddConfig("XEngine"); - + if (config.Configs["XEngine"].GetBoolean("AllowGodFunctions", false)) { if (World.ExternalChecks.ExternalChecksCanRunConsoleCommand(m_host.OwnerID)) @@ -5576,7 +5576,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine { m_host.AddScriptLPS(1); NotImplemented("llSetInventoryPermMask"); - } + } public string llGetInventoryCreator(string item) { @@ -6451,7 +6451,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine private static Dictionary m_Notecards = new Dictionary(); - + public static void Cache(LLUUID assetID, string text) { CacheCheck(); @@ -6523,7 +6523,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine count += ln.Length + 1; idx++; } - + return output.ToArray(); } break; -- cgit v1.1