From ba2de258f420245d07c4d194f8f8a71abe299aff Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 25 Mar 2008 14:27:39 +0000 Subject: * Refactored out circular reference in Region.Environment <-> Framework.Data.Base We REALLY need to get the db layer sorted soon... --- .../Framework/Data.MySQL/MySQLDatabaseMapper.cs | 52 ---------------------- .../Data.MySQLMapper/MySQLDatabaseMapper.cs | 51 +++++++++++++++++++++ OpenSim/Framework/Data/OpenSimDatabaseConnector.cs | 20 --------- .../Environment/Modules/AvatarFactoryModule.cs | 2 +- .../Region/Environment/Scenes/SceneObjectGroup.cs | 14 +++--- .../Region/Environment/Scenes/SceneObjectPart.cs | 11 ++++- .../Examples/SimpleModule/FileSystemObject.cs | 1 - .../Region/Examples/SimpleModule/RegionModule.cs | 5 ++- prebuild.xml | 32 ++++++++++++- 9 files changed, 99 insertions(+), 89 deletions(-) delete mode 100644 OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs create mode 100644 OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs deleted file mode 100644 index 8f65d70..0000000 --- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSim Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * 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.Data.Common; -using MySql.Data.MySqlClient; - -namespace OpenSim.Framework.Data.MySQL -{ - /* - public class MySQLDatabaseMapper : OpenSimDatabaseConnector - { - public MySQLDatabaseMapper(string connectionString) - : base(connectionString) - { - } - - public override DbConnection GetNewConnection() - { - MySqlConnection connection = new MySqlConnection(m_connectionString); - return connection; - } - - public override string CreateParamName(string fieldName) - { - return "?" + fieldName; - } - }*/ -} diff --git a/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs new file mode 100644 index 0000000..da3b6a5 --- /dev/null +++ b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs @@ -0,0 +1,51 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * 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.Data.Common; +using MySql.Data.MySqlClient; + +namespace OpenSim.Framework.Data.MySQLMapper +{ + public class MySQLDatabaseMapper : OpenSimDatabaseConnector + { + public MySQLDatabaseMapper(string connectionString) + : base(connectionString) + { + } + + public override DbConnection GetNewConnection() + { + MySqlConnection connection = new MySqlConnection(m_connectionString); + return connection; + } + + public override string CreateParamName(string fieldName) + { + return "?" + fieldName; + } + } +} \ No newline at end of file diff --git a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs index 2bfd6f1..809fd1e 100644 --- a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs +++ b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs @@ -28,7 +28,6 @@ using System.Data; using System.Data.Common; using libsecondlife; -using MySql.Data.MySqlClient; using OpenSim.Framework.Data.Base; @@ -55,23 +54,4 @@ namespace OpenSim.Framework.Data return new OpenSimDataReader(reader); } } - - public class MySQLDatabaseMapper : OpenSimDatabaseConnector - { - public MySQLDatabaseMapper(string connectionString) - : base(connectionString) - { - } - - public override DbConnection GetNewConnection() - { - MySqlConnection connection = new MySqlConnection(m_connectionString); - return connection; - } - - public override string CreateParamName(string fieldName) - { - return "?" + fieldName; - } - } } diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs index b8bb7db..da33726 100644 --- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs +++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs @@ -32,7 +32,7 @@ using libsecondlife; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Data; +using OpenSim.Framework.Data.MySQLMapper; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; using OpenSim.Framework.Data.Base; diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 2f2a1be..edb76e9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -1360,8 +1360,8 @@ namespace OpenSim.Region.Environment.Scenes SceneObjectPart part = GetChildPart(localID); if (part != null) { - part.Text = text; - } + part.SetText( text ); + } } public void SetPartText(string text, LLUUID partID) @@ -1369,7 +1369,7 @@ namespace OpenSim.Region.Environment.Scenes SceneObjectPart part = GetChildPart(partID); if (part != null) { - part.Text = text; + part.SetText( text ); } } @@ -1905,12 +1905,6 @@ namespace OpenSim.Region.Environment.Scenes return null; } - public void UpdateText(string text) - { - m_rootPart.Text = text; - m_rootPart.ScheduleTerseUpdate(); - } - public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient) { if (m_rootPart.LocalId == localId) @@ -1995,6 +1989,8 @@ namespace OpenSim.Region.Environment.Scenes (int) (color.y*0xff), (int) (color.z*0xff)); Text = text; + + m_rootPart.ScheduleFullUpdate(); } public void ApplyPhysics(bool m_physicalPrim) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index cbefc19..2c65a8f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -509,7 +509,6 @@ namespace OpenSim.Region.Environment.Scenes set { m_text = value; - ScheduleFullUpdate(); } } @@ -2289,13 +2288,20 @@ namespace OpenSim.Region.Environment.Scenes { } + + public void SetText(string text) + { + Text = text; + ScheduleFullUpdate(); + } + public void SetText(string text, Vector3 color, double alpha) { Color = Color.FromArgb(0xff - (int) (alpha*0xff), (int) (color.x*0xff), (int) (color.y*0xff), (int) (color.z*0xff)); - Text = text; + SetText( text ); } protected SceneObjectPart(SerializationInfo info, StreamingContext context) @@ -2411,5 +2417,6 @@ namespace OpenSim.Region.Environment.Scenes info.AddValue("m_shape", m_shape); info.AddValue("m_parentGroup", m_parentGroup); } + } } diff --git a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs index 7a1e93f..34ed086 100644 --- a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs @@ -38,7 +38,6 @@ namespace OpenSim.Region.Examples.SimpleModule : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default) { Text = fileInfo.Name; - ScheduleGroupForFullUpdate(); } protected override bool InSceneBackup diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs index 32477f4..3b21d43 100644 --- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs +++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs @@ -55,8 +55,8 @@ namespace OpenSim.Region.Examples.SimpleModule LLVector3 pos = new LLVector3(110, 129, 27); AddCpuCounter(regionInfo, pos); - AddComplexObjects(regionInfo, pos); - AddAvatars(); + // AddComplexObjects(regionInfo, pos); + // AddAvatars(); AddFileSystemObjects(); } @@ -79,6 +79,7 @@ namespace OpenSim.Region.Examples.SimpleModule FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos); m_scene.AddEntity(fileObject); + fileObject.ScheduleGroupForFullUpdate(); } } diff --git a/prebuild.xml b/prebuild.xml index f9b1602..68a9815 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -177,6 +177,35 @@ + + + + ../../../bin/ + + + + + ../../../bin/ + + + + ../../../bin/ + + + + + + + + + + + + + + + + @@ -196,7 +225,6 @@ - @@ -711,7 +739,6 @@ - @@ -723,6 +750,7 @@ + -- cgit v1.1