aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712008-03-25 14:27:39 +0000
committerlbsa712008-03-25 14:27:39 +0000
commitba2de258f420245d07c4d194f8f8a71abe299aff (patch)
tree7292d4f76a631898ddfe765968888206d5390677
parentAdd "warnings as errors" support for nant and monodevelop to Prebuild (though... (diff)
downloadopensim-SC_OLD-ba2de258f420245d07c4d194f8f8a71abe299aff.zip
opensim-SC_OLD-ba2de258f420245d07c4d194f8f8a71abe299aff.tar.gz
opensim-SC_OLD-ba2de258f420245d07c4d194f8f8a71abe299aff.tar.bz2
opensim-SC_OLD-ba2de258f420245d07c4d194f8f8a71abe299aff.tar.xz
* Refactored out circular reference in Region.Environment <-> Framework.Data.Base
We REALLY need to get the db layer sorted soon...
-rw-r--r--OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs (renamed from OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs)9
-rw-r--r--OpenSim/Framework/Data/OpenSimDatabaseConnector.cs20
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs14
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs11
-rw-r--r--OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs1
-rw-r--r--OpenSim/Region/Examples/SimpleModule/RegionModule.cs5
-rw-r--r--prebuild.xml32
8 files changed, 52 insertions, 42 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
index 8f65d70..da3b6a5 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
+++ b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
@@ -27,10 +27,9 @@
27 27
28using System.Data.Common; 28using System.Data.Common;
29using MySql.Data.MySqlClient; 29using MySql.Data.MySqlClient;
30 30
31namespace OpenSim.Framework.Data.MySQL 31namespace OpenSim.Framework.Data.MySQLMapper
32{ 32{
33 /*
34 public class MySQLDatabaseMapper : OpenSimDatabaseConnector 33 public class MySQLDatabaseMapper : OpenSimDatabaseConnector
35 { 34 {
36 public MySQLDatabaseMapper(string connectionString) 35 public MySQLDatabaseMapper(string connectionString)
@@ -48,5 +47,5 @@ namespace OpenSim.Framework.Data.MySQL
48 { 47 {
49 return "?" + fieldName; 48 return "?" + fieldName;
50 } 49 }
51 }*/ 50 }
52} 51} \ 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 @@
28using System.Data; 28using System.Data;
29using System.Data.Common; 29using System.Data.Common;
30using libsecondlife; 30using libsecondlife;
31using MySql.Data.MySqlClient;
32 31
33using OpenSim.Framework.Data.Base; 32using OpenSim.Framework.Data.Base;
34 33
@@ -55,23 +54,4 @@ namespace OpenSim.Framework.Data
55 return new OpenSimDataReader(reader); 54 return new OpenSimDataReader(reader);
56 } 55 }
57 } 56 }
58
59 public class MySQLDatabaseMapper : OpenSimDatabaseConnector
60 {
61 public MySQLDatabaseMapper(string connectionString)
62 : base(connectionString)
63 {
64 }
65
66 public override DbConnection GetNewConnection()
67 {
68 MySqlConnection connection = new MySqlConnection(m_connectionString);
69 return connection;
70 }
71
72 public override string CreateParamName(string fieldName)
73 {
74 return "?" + fieldName;
75 }
76 }
77} 57}
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;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Data; 35using OpenSim.Framework.Data.MySQLMapper;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Environment.Scenes;
38using OpenSim.Framework.Data.Base; 38using 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
1360 SceneObjectPart part = GetChildPart(localID); 1360 SceneObjectPart part = GetChildPart(localID);
1361 if (part != null) 1361 if (part != null)
1362 { 1362 {
1363 part.Text = text; 1363 part.SetText( text );
1364 } 1364 }
1365 } 1365 }
1366 1366
1367 public void SetPartText(string text, LLUUID partID) 1367 public void SetPartText(string text, LLUUID partID)
@@ -1369,7 +1369,7 @@ namespace OpenSim.Region.Environment.Scenes
1369 SceneObjectPart part = GetChildPart(partID); 1369 SceneObjectPart part = GetChildPart(partID);
1370 if (part != null) 1370 if (part != null)
1371 { 1371 {
1372 part.Text = text; 1372 part.SetText( text );
1373 } 1373 }
1374 } 1374 }
1375 1375
@@ -1905,12 +1905,6 @@ namespace OpenSim.Region.Environment.Scenes
1905 return null; 1905 return null;
1906 } 1906 }
1907 1907
1908 public void UpdateText(string text)
1909 {
1910 m_rootPart.Text = text;
1911 m_rootPart.ScheduleTerseUpdate();
1912 }
1913
1914 public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient) 1908 public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient)
1915 { 1909 {
1916 if (m_rootPart.LocalId == localId) 1910 if (m_rootPart.LocalId == localId)
@@ -1995,6 +1989,8 @@ namespace OpenSim.Region.Environment.Scenes
1995 (int) (color.y*0xff), 1989 (int) (color.y*0xff),
1996 (int) (color.z*0xff)); 1990 (int) (color.z*0xff));
1997 Text = text; 1991 Text = text;
1992
1993 m_rootPart.ScheduleFullUpdate();
1998 } 1994 }
1999 1995
2000 public void ApplyPhysics(bool m_physicalPrim) 1996 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
509 set 509 set
510 { 510 {
511 m_text = value; 511 m_text = value;
512 ScheduleFullUpdate();
513 } 512 }
514 } 513 }
515 514
@@ -2289,13 +2288,20 @@ namespace OpenSim.Region.Environment.Scenes
2289 { 2288 {
2290 } 2289 }
2291 2290
2291
2292 public void SetText(string text)
2293 {
2294 Text = text;
2295 ScheduleFullUpdate();
2296 }
2297
2292 public void SetText(string text, Vector3 color, double alpha) 2298 public void SetText(string text, Vector3 color, double alpha)
2293 { 2299 {
2294 Color = Color.FromArgb(0xff - (int) (alpha*0xff), 2300 Color = Color.FromArgb(0xff - (int) (alpha*0xff),
2295 (int) (color.x*0xff), 2301 (int) (color.x*0xff),
2296 (int) (color.y*0xff), 2302 (int) (color.y*0xff),
2297 (int) (color.z*0xff)); 2303 (int) (color.z*0xff));
2298 Text = text; 2304 SetText( text );
2299 } 2305 }
2300 2306
2301 protected SceneObjectPart(SerializationInfo info, StreamingContext context) 2307 protected SceneObjectPart(SerializationInfo info, StreamingContext context)
@@ -2411,5 +2417,6 @@ namespace OpenSim.Region.Environment.Scenes
2411 info.AddValue("m_shape", m_shape); 2417 info.AddValue("m_shape", m_shape);
2412 info.AddValue("m_parentGroup", m_parentGroup); 2418 info.AddValue("m_parentGroup", m_parentGroup);
2413 } 2419 }
2420
2414 } 2421 }
2415} 2422}
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
38 : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default) 38 : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default)
39 { 39 {
40 Text = fileInfo.Name; 40 Text = fileInfo.Name;
41 ScheduleGroupForFullUpdate();
42 } 41 }
43 42
44 protected override bool InSceneBackup 43 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
55 LLVector3 pos = new LLVector3(110, 129, 27); 55 LLVector3 pos = new LLVector3(110, 129, 27);
56 56
57 AddCpuCounter(regionInfo, pos); 57 AddCpuCounter(regionInfo, pos);
58 AddComplexObjects(regionInfo, pos); 58 // AddComplexObjects(regionInfo, pos);
59 AddAvatars(); 59 // AddAvatars();
60 AddFileSystemObjects(); 60 AddFileSystemObjects();
61 } 61 }
62 62
@@ -79,6 +79,7 @@ namespace OpenSim.Region.Examples.SimpleModule
79 79
80 FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos); 80 FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos);
81 m_scene.AddEntity(fileObject); 81 m_scene.AddEntity(fileObject);
82 fileObject.ScheduleGroupForFullUpdate();
82 } 83 }
83 } 84 }
84 85
diff --git a/prebuild.xml b/prebuild.xml
index f9b1602..68a9815 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -177,6 +177,35 @@
177 </Files> 177 </Files>
178 </Project> 178 </Project>
179 179
180 <Project name="OpenSim.Framework.Data.MySQLMapper" path="OpenSim/Framework/Data.MySQLMapper" type="Library">
181 <Configuration name="Debug">
182 <Options>
183 <OutputPath>../../../bin/</OutputPath>
184 </Options>
185 </Configuration>
186 <Configuration name="Release">
187 <Options>
188 <OutputPath>../../../bin/</OutputPath>
189 </Options>
190 </Configuration>
191
192 <ReferencePath>../../../bin/</ReferencePath>
193 <Reference name="System" localCopy="false"/>
194 <Reference name="System.Xml"/>
195 <Reference name="System.Data"/>
196 <Reference name="OpenSim.Framework"/>
197 <Reference name="OpenSim.Framework.Data"/>
198 <Reference name="OpenSim.Framework.Data.Base"/>
199 <Reference name="libsecondlife.dll"/>
200 <Reference name="MySql.Data.dll"/>
201 <Reference name="OpenSim.Framework.Console"/>
202 <Reference name="log4net"/>
203
204 <Files>
205 <Match pattern="*.cs" recurse="true"/>
206 </Files>
207 </Project>
208
180 <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library"> 209 <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
181 <Configuration name="Debug"> 210 <Configuration name="Debug">
182 <Options> 211 <Options>
@@ -196,7 +225,6 @@
196 <Reference name="XMLRPC.dll"/> 225 <Reference name="XMLRPC.dll"/>
197 <Reference name="libsecondlife.dll"/> 226 <Reference name="libsecondlife.dll"/>
198 <Reference name="OpenSim.Framework"/> 227 <Reference name="OpenSim.Framework"/>
199 <Reference name="MySql.Data.dll"/>
200 <Reference name="OpenSim.Framework.Data.Base"/> 228 <Reference name="OpenSim.Framework.Data.Base"/>
201 <Reference name="log4net"/> 229 <Reference name="log4net"/>
202 <Files> 230 <Files>
@@ -711,7 +739,6 @@
711 <Reference name="System.Drawing"/> 739 <Reference name="System.Drawing"/>
712 <Reference name="libsecondlife.dll"/> 740 <Reference name="libsecondlife.dll"/>
713 <Reference name="Axiom.MathLib.dll"/> 741 <Reference name="Axiom.MathLib.dll"/>
714 <Reference name="Db4objects.Db4o.dll"/>
715 <Reference name="OpenSim.Region.Terrain.BasicTerrain"/> 742 <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
716 <Reference name="OpenSim.Framework"/> 743 <Reference name="OpenSim.Framework"/>
717 <Reference name="OpenSim.Framework.Data" /> 744 <Reference name="OpenSim.Framework.Data" />
@@ -723,6 +750,7 @@
723 <Reference name="XMLRPC.dll"/> 750 <Reference name="XMLRPC.dll"/>
724 <Reference name="OpenSim.Framework.Communications"/> 751 <Reference name="OpenSim.Framework.Communications"/>
725 <Reference name="OpenSim.Framework.Data.Base"/> 752 <Reference name="OpenSim.Framework.Data.Base"/>
753 <Reference name="OpenSim.Framework.Data.MySQLMapper"/>
726 <Reference name="Nini.dll" /> 754 <Reference name="Nini.dll" />
727 <Reference name="log4net"/> 755 <Reference name="log4net"/>
728 <Files> 756 <Files>