OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

prioritization
Diva Canto 2009-10-05 10:31:41 -07:00
parent a2d5da7129 10c4b88ccf
commit 62ea6b6383
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
View File

@ -575,7 +575,7 @@ ELSE
/// <returns></returns> /// <returns></returns>
public List<LandData> LoadLandObjects(UUID regionUUID) public List<LandData> LoadLandObjects(UUID regionUUID)
{ {
List<LandData> landDataForRegion = new List<LandData>(); List<LandData> LandDataForRegion = new List<LandData>();
string sql = "select * from land where RegionUUID = @RegionUUID"; string sql = "select * from land where RegionUUID = @RegionUUID";
@ -588,30 +588,30 @@ ELSE
{ {
while (readerLandData.Read()) while (readerLandData.Read())
{ {
landDataForRegion.Add(BuildLandData(readerLandData)); LandDataForRegion.Add(BuildLandData(readerLandData));
} }
} }
} }
//Retrieve all accesslist data for all landdata //Retrieve all accesslist data for all landdata
foreach (LandData landData in landDataForRegion) foreach (LandData LandData in LandDataForRegion)
{ {
sql = "select * from landaccesslist where LandUUID = @LandUUID"; sql = "select * from landaccesslist where LandUUID = @LandUUID";
using (AutoClosingSqlCommand cmdAccessList = _Database.Query(sql)) using (AutoClosingSqlCommand cmdAccessList = _Database.Query(sql))
{ {
cmdAccessList.Parameters.Add(_Database.CreateParameter("@LandUUID", landData.GlobalID)); cmdAccessList.Parameters.Add(_Database.CreateParameter("@LandUUID", LandData.GlobalID));
using (SqlDataReader readerAccessList = cmdAccessList.ExecuteReader()) using (SqlDataReader readerAccessList = cmdAccessList.ExecuteReader())
{ {
while (readerAccessList.Read()) while (readerAccessList.Read())
{ {
landData.ParcelAccessList.Add(BuildLandAccessData(readerAccessList)); LandData.ParcelAccessList.Add(BuildLandAccessData(readerAccessList));
} }
} }
} }
} }
//Return data //Return data
return landDataForRegion; return LandDataForRegion;
} }
/// <summary> /// <summary>
@ -624,7 +624,7 @@ ELSE
//As the delete landaccess is already in the mysql code //As the delete landaccess is already in the mysql code
//Delete old values //Delete old values
RemoveLandObject(parcel.landData.GlobalID); RemoveLandObject(parcel.LandData.GlobalID);
//Insert new values //Insert new values
string sql = @"INSERT INTO [land] string sql = @"INSERT INTO [land]
@ -634,7 +634,7 @@ VALUES
using (AutoClosingSqlCommand cmd = _Database.Query(sql)) using (AutoClosingSqlCommand cmd = _Database.Query(sql))
{ {
cmd.Parameters.AddRange(CreateLandParameters(parcel.landData, parcel.regionUUID)); cmd.Parameters.AddRange(CreateLandParameters(parcel.LandData, parcel.RegionUUID));
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
@ -643,9 +643,9 @@ VALUES
using (AutoClosingSqlCommand cmd = _Database.Query(sql)) using (AutoClosingSqlCommand cmd = _Database.Query(sql))
{ {
foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.landData.ParcelAccessList) foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
{ {
cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.regionUUID)); cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID));
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
cmd.Parameters.Clear(); cmd.Parameters.Clear();

7
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -3476,7 +3476,7 @@ namespace OpenSim.Region.Physics.OdePlugin
public override void UnCombine(PhysicsScene pScene) public override void UnCombine(PhysicsScene pScene)
{ {
IntPtr localGround = IntPtr.Zero; IntPtr localGround = IntPtr.Zero;
float[] localHeightfield; //float[] localHeightfield;
bool proceed = false; bool proceed = false;
List<IntPtr> geomDestroyList = new List<IntPtr>(); List<IntPtr> geomDestroyList = new List<IntPtr>();
@ -3771,16 +3771,13 @@ namespace OpenSim.Region.Physics.OdePlugin
sides.Z = 0.5f; sides.Z = 0.5f;
ds.DrawBox(ref pos, ref R, ref sides); ds.DrawBox(ref pos, ref R, ref sides);
} }
} }
} }
} }
public void start(int unused) public void start(int unused)
{ {
ds.SetViewpoint(ref xyz, ref hpr); ds.SetViewpoint(ref xyz, ref hpr);
} }
#endif #endif