aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs4
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs6
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs4
-rw-r--r--OpenSim/Framework/Util.cs7
-rw-r--r--OpenSim/Grid/UserServer.Config/DbUserConfig.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs23
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs2
9 files changed, 19 insertions, 33 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 075f2e9..7163a92 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -78,8 +78,8 @@ namespace OpenSim.Data.NHibernate
78 cfg.AddAssembly("OpenSim.Data.NHibernate"); 78 cfg.AddAssembly("OpenSim.Data.NHibernate");
79 79
80 HbmSerializer.Default.Validate = true; 80 HbmSerializer.Default.Validate = true;
81 using ( MemoryStream stream = 81 using (MemoryStream stream =
82 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) 82 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
83 cfg.AddInputStream(stream); 83 cfg.AddInputStream(stream);
84 84
85 factory = cfg.BuildSessionFactory(); 85 factory = cfg.BuildSessionFactory();
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 228e0b6..902ecfb 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -75,8 +75,8 @@ namespace OpenSim.Data.NHibernate
75 cfg.AddAssembly("OpenSim.Data.NHibernate"); 75 cfg.AddAssembly("OpenSim.Data.NHibernate");
76 76
77 HbmSerializer.Default.Validate = true; 77 HbmSerializer.Default.Validate = true;
78 using ( MemoryStream stream = 78 using (MemoryStream stream =
79 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) 79 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
80 cfg.AddInputStream(stream); 80 cfg.AddInputStream(stream);
81 81
82 // If uncommented this will auto create tables, but it 82 // If uncommented this will auto create tables, but it
@@ -90,7 +90,6 @@ namespace OpenSim.Data.NHibernate
90 InitDB(); 90 InitDB();
91 } 91 }
92 92
93
94 private void InitDB() 93 private void InitDB()
95 { 94 {
96 string regex = @"no such table: Inventory"; 95 string regex = @"no such table: Inventory";
@@ -117,7 +116,6 @@ namespace OpenSim.Data.NHibernate
117 } 116 }
118 } 117 }
119 118
120
121 /***************************************************************** 119 /*****************************************************************
122 * 120 *
123 * Basic CRUD operations on Data 121 * Basic CRUD operations on Data
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 4de0291..678ec04 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -74,8 +74,8 @@ namespace OpenSim.Data.NHibernate
74 cfg.AddAssembly("OpenSim.Data.NHibernate"); 74 cfg.AddAssembly("OpenSim.Data.NHibernate");
75 75
76 HbmSerializer.Default.Validate = true; 76 HbmSerializer.Default.Validate = true;
77 using ( MemoryStream stream = 77 using (MemoryStream stream =
78 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) 78 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
79 cfg.AddInputStream(stream); 79 cfg.AddInputStream(stream);
80 80
81 // new SchemaExport(cfg).Create(true, true); 81 // new SchemaExport(cfg).Create(true, true);
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 8e5b02d..719dda6 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
58 private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]"; 58 private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]";
59 private static object XferLock = new object(); 59 private static object XferLock = new object();
60 60
61 #region Vector Equasions 61 #region Vector Equations
62 62
63 /// <summary> 63 /// <summary>
64 /// Get the distance between two 3d vectors 64 /// Get the distance between two 3d vectors
@@ -214,8 +214,8 @@ namespace OpenSim.Framework
214 } 214 }
215 215
216 // Windows 2000 / Pre-SP2 XP 216 // Windows 2000 / Pre-SP2 XP
217 if (Environment.OSVersion.Version.Major == 5 && ( 217 if (Environment.OSVersion.Version.Major == 5 &&
218 Environment.OSVersion.Version.Minor == 0)) 218 Environment.OSVersion.Version.Minor == 0)
219 { 219 {
220 reason = "Please update to Windows XP Service Pack 2 or Server2003"; 220 reason = "Please update to Windows XP Service Pack 2 or Server2003";
221 return false; 221 return false;
@@ -544,7 +544,6 @@ namespace OpenSim.Framework
544 /// <summary> 544 /// <summary>
545 /// returns the contents of /etc/issue on Unix Systems 545 /// returns the contents of /etc/issue on Unix Systems
546 /// Use this for where it's absolutely necessary to implement platform specific stuff 546 /// Use this for where it's absolutely necessary to implement platform specific stuff
547 /// ( like the ODE library :P
548 /// </summary> 547 /// </summary>
549 /// <returns></returns> 548 /// <returns></returns>
550 public static string ReadEtcIssue() 549 public static string ReadEtcIssue()
diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
index 0f29bbe..93b854d 100644
--- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
+++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
@@ -40,7 +40,7 @@ namespace OpenUser.Config.UserConfigDb4o
40 public UserConfig GetConfigObject() 40 public UserConfig GetConfigObject()
41 { 41 {
42 m_log.Info("[DBUSERCONFIG]: Loading Db40Config dll"); 42 m_log.Info("[DBUSERCONFIG]: Loading Db40Config dll");
43 return ( new DbUserConfig()); 43 return new DbUserConfig();
44 } 44 }
45 } 45 }
46 46
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 32dc7d5..bc80915 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1284,10 +1284,9 @@ namespace OpenSim.Region.Environment.Scenes
1284 byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID, 1284 byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID,
1285 byte RayEndIsIntersection) 1285 byte RayEndIsIntersection)
1286 { 1286 {
1287 LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f, 0.5f, 0.5f), false);
1287 1288
1288 LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f,0.5f,0.5f), false); 1289 if (ExternalChecks.ExternalChecksCanRezObject(1, ownerID, pos))
1289
1290 if ( ExternalChecks.ExternalChecksCanRezObject(1,ownerID,pos))
1291 { 1290 {
1292 // rez ON the ground, not IN the ground 1291 // rez ON the ground, not IN the ground
1293 pos.Z += 0.25F; 1292 pos.Z += 0.25F;
@@ -1515,8 +1514,6 @@ namespace OpenSim.Region.Environment.Scenes
1515 } 1514 }
1516 } 1515 }
1517 } 1516 }
1518
1519
1520 } 1517 }
1521 } 1518 }
1522 return true; 1519 return true;
@@ -1525,7 +1522,6 @@ namespace OpenSim.Region.Environment.Scenes
1525 { 1522 {
1526 return false; 1523 return false;
1527 } 1524 }
1528
1529 } 1525 }
1530 1526
1531 #endregion 1527 #endregion
@@ -1658,6 +1654,7 @@ namespace OpenSim.Region.Environment.Scenes
1658 1654
1659 EventManager.TriggerOnNewClient(client); 1655 EventManager.TriggerOnNewClient(client);
1660 } 1656 }
1657
1661 public virtual void TeleportClientHome(LLUUID AgentId, IClientAPI client) 1658 public virtual void TeleportClientHome(LLUUID AgentId, IClientAPI client)
1662 { 1659 {
1663 UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(AgentId); 1660 UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(AgentId);
@@ -1701,7 +1698,7 @@ namespace OpenSim.Region.Environment.Scenes
1701 EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, false); 1698 EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, false);
1702 1699
1703 // Un-comment out the following line to Get Raytrace results printed to the console. 1700 // Un-comment out the following line to Get Raytrace results printed to the console.
1704 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString()); 1701 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
1705 float ScaleOffset = 0.5f; 1702 float ScaleOffset = 0.5f;
1706 1703
1707 // If we hit something 1704 // If we hit something
@@ -1745,18 +1742,13 @@ namespace OpenSim.Region.Environment.Scenes
1745 m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID); 1742 m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID);
1746 } 1743 }
1747 1744
1748
1749 return; 1745 return;
1750 } 1746 }
1751 return;
1752
1753 1747
1748 return;
1754 } 1749 }
1755
1756
1757
1758
1759 } 1750 }
1751
1760 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags) 1752 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags)
1761 { 1753 {
1762 UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(remoteClient.AgentId); 1754 UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(remoteClient.AgentId);
@@ -1938,7 +1930,6 @@ namespace OpenSim.Region.Environment.Scenes
1938 } 1930 }
1939 } 1931 }
1940 } 1932 }
1941
1942 } 1933 }
1943 1934
1944 public override void CloseAllAgents(uint circuitcode) 1935 public override void CloseAllAgents(uint circuitcode)
@@ -2014,7 +2005,6 @@ namespace OpenSim.Region.Environment.Scenes
2014 m_sceneGridService.Close(); 2005 m_sceneGridService.Close();
2015 } 2006 }
2016 2007
2017
2018 /// <summary> 2008 /// <summary>
2019 /// Do the work necessary to initiate a new user connection. 2009 /// Do the work necessary to initiate a new user connection.
2020 /// At the moment, this consists of setting up the caps infrastructure 2010 /// At the moment, this consists of setting up the caps infrastructure
@@ -2164,7 +2154,6 @@ namespace OpenSim.Region.Environment.Scenes
2164 childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); 2154 childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
2165 // Not Implemented: 2155 // Not Implemented:
2166 //TODO: Do we need to pass the message on to one of our neighbors? 2156 //TODO: Do we need to pass the message on to one of our neighbors?
2167
2168 } 2157 }
2169 return true; 2158 return true;
2170 } 2159 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index a52d5f9..80b93b1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1282,7 +1282,7 @@ namespace OpenSim.Region.Environment.Scenes
1282 //} 1282 //}
1283 //} 1283 //}
1284 //a = (d - iray.Origin.Dot(normals[i])) / s; 1284 //a = (d - iray.Origin.Dot(normals[i])) / s;
1285 //if ( iray.Direction.Dot(normals[i]) < 0) 1285 //if (iray.Direction.Dot(normals[i]) < 0)
1286 //{ 1286 //{
1287 //if (a > fmax) 1287 //if (a > fmax)
1288 //{ 1288 //{
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index ba8bbd9..44805cc 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2312,7 +2312,7 @@ namespace OpenSim.Region.Environment.Scenes
2312 /* 2312 /*
2313 Dictionary<Guid, ScenePartUpdate> updateTimes_work = new Dictionary<Guid, ScenePartUpdate>(); 2313 Dictionary<Guid, ScenePartUpdate> updateTimes_work = new Dictionary<Guid, ScenePartUpdate>();
2314 2314
2315 foreach ( LLUUID id in m_updateTimes.Keys) 2315 foreach (LLUUID id in m_updateTimes.Keys)
2316 { 2316 {
2317 updateTimes_work.Add(id.UUID, m_updateTimes[id]); 2317 updateTimes_work.Add(id.UUID, m_updateTimes[id]);
2318 } 2318 }
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index 6cca36d..94d2ec0 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
62 } 62 }
63 63
64 m_svnClient.Commit3(svnfilenames, true, false); 64 m_svnClient.Commit3(svnfilenames, true, false);
65 m_log.Info("[SVNBACKUP]: Server backup successful ( " + String.Concat(regions.ToArray()) + ")."); 65 m_log.Info("[SVNBACKUP]: Server backup successful (" + String.Concat(regions.ToArray()) + ").");
66 } 66 }
67 67
68 private List<string> CreateAndAddExport(Scene scene) 68 private List<string> CreateAndAddExport(Scene scene)