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

Minor cleanup.

0.6.0-stable
Jeff Ames 2008-05-16 13:33:57 +00:00
parent 9040213366
commit 7fefb80abb
9 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/NHibernate/NHibernateAssetData.cs
View File

@ -78,8 +78,8 @@ namespace OpenSim.Data.NHibernate
cfg.AddAssembly("OpenSim.Data.NHibernate");
HbmSerializer.Default.Validate = true;
using ( MemoryStream stream =
HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
using (MemoryStream stream =
HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
cfg.AddInputStream(stream);
factory = cfg.BuildSessionFactory();

6
OpenSim/Data/NHibernate/NHibernateInventoryData.cs
View File

@ -75,8 +75,8 @@ namespace OpenSim.Data.NHibernate
cfg.AddAssembly("OpenSim.Data.NHibernate");
HbmSerializer.Default.Validate = true;
using ( MemoryStream stream =
HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
using (MemoryStream stream =
HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
cfg.AddInputStream(stream);
// If uncommented this will auto create tables, but it
@ -90,7 +90,6 @@ namespace OpenSim.Data.NHibernate
InitDB();
}
private void InitDB()
{
string regex = @"no such table: Inventory";
@ -117,7 +116,6 @@ namespace OpenSim.Data.NHibernate
}
}
/*****************************************************************
*
* Basic CRUD operations on Data

4
OpenSim/Data/NHibernate/NHibernateUserData.cs
View File

@ -74,8 +74,8 @@ namespace OpenSim.Data.NHibernate
cfg.AddAssembly("OpenSim.Data.NHibernate");
HbmSerializer.Default.Validate = true;
using ( MemoryStream stream =
HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
using (MemoryStream stream =
HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
cfg.AddInputStream(stream);
// new SchemaExport(cfg).Create(true, true);

7
OpenSim/Framework/Util.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Framework
private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]";
private static object XferLock = new object();
#region Vector Equasions
#region Vector Equations
/// <summary>
/// Get the distance between two 3d vectors
@ -214,8 +214,8 @@ namespace OpenSim.Framework
}
// Windows 2000 / Pre-SP2 XP
if (Environment.OSVersion.Version.Major == 5 && (
Environment.OSVersion.Version.Minor == 0))
if (Environment.OSVersion.Version.Major == 5 &&
Environment.OSVersion.Version.Minor == 0)
{
reason = "Please update to Windows XP Service Pack 2 or Server2003";
return false;
@ -544,7 +544,6 @@ namespace OpenSim.Framework
/// <summary>
/// returns the contents of /etc/issue on Unix Systems
/// Use this for where it's absolutely necessary to implement platform specific stuff
/// ( like the ODE library :P
/// </summary>
/// <returns></returns>
public static string ReadEtcIssue()

2
OpenSim/Grid/UserServer.Config/DbUserConfig.cs
View File

@ -40,7 +40,7 @@ namespace OpenUser.Config.UserConfigDb4o
public UserConfig GetConfigObject()
{
m_log.Info("[DBUSERCONFIG]: Loading Db40Config dll");
return ( new DbUserConfig());
return new DbUserConfig();
}
}

23
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1284,10 +1284,9 @@ namespace OpenSim.Region.Environment.Scenes
byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID,
byte RayEndIsIntersection)
{
LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f, 0.5f, 0.5f), false);
LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f,0.5f,0.5f), false);
if ( ExternalChecks.ExternalChecksCanRezObject(1,ownerID,pos))
if (ExternalChecks.ExternalChecksCanRezObject(1, ownerID, pos))
{
// rez ON the ground, not IN the ground
pos.Z += 0.25F;
@ -1515,8 +1514,6 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
}
}
return true;
@ -1525,7 +1522,6 @@ namespace OpenSim.Region.Environment.Scenes
{
return false;
}
}
#endregion
@ -1658,6 +1654,7 @@ namespace OpenSim.Region.Environment.Scenes
EventManager.TriggerOnNewClient(client);
}
public virtual void TeleportClientHome(LLUUID AgentId, IClientAPI client)
{
UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(AgentId);
@ -1701,7 +1698,7 @@ namespace OpenSim.Region.Environment.Scenes
EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, false);
// Un-comment out the following line to Get Raytrace results printed to the console.
// m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
// m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
float ScaleOffset = 0.5f;
// If we hit something
@ -1745,18 +1742,13 @@ namespace OpenSim.Region.Environment.Scenes
m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID);
}
return;
}
return;
}
}
public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags)
{
UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(remoteClient.AgentId);
@ -1938,7 +1930,6 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
}
public override void CloseAllAgents(uint circuitcode)
@ -2014,7 +2005,6 @@ namespace OpenSim.Region.Environment.Scenes
m_sceneGridService.Close();
}
/// <summary>
/// Do the work necessary to initiate a new user connection.
/// At the moment, this consists of setting up the caps infrastructure
@ -2164,7 +2154,6 @@ namespace OpenSim.Region.Environment.Scenes
childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
// Not Implemented:
//TODO: Do we need to pass the message on to one of our neighbors?
}
return true;
}

2
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -1282,7 +1282,7 @@ namespace OpenSim.Region.Environment.Scenes
//}
//}
//a = (d - iray.Origin.Dot(normals[i])) / s;
//if ( iray.Direction.Dot(normals[i]) < 0)
//if (iray.Direction.Dot(normals[i]) < 0)
//{
//if (a > fmax)
//{

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -2312,7 +2312,7 @@ namespace OpenSim.Region.Environment.Scenes
/*
Dictionary<Guid, ScenePartUpdate> updateTimes_work = new Dictionary<Guid, ScenePartUpdate>();
foreach ( LLUUID id in m_updateTimes.Keys)
foreach (LLUUID id in m_updateTimes.Keys)
{
updateTimes_work.Add(id.UUID, m_updateTimes[id]);
}

2
OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
View File

@ -62,7 +62,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
}
m_svnClient.Commit3(svnfilenames, true, false);
m_log.Info("[SVNBACKUP]: Server backup successful ( " + String.Concat(regions.ToArray()) + ").");
m_log.Info("[SVNBACKUP]: Server backup successful (" + String.Concat(regions.ToArray()) + ").");
}
private List<string> CreateAndAddExport(Scene scene)