Added prebuild.exe and fixed a couple of namespace problems in AvatarAnimations.cs.
Now need to update prebuild.xmlSugilite
parent
88945dca1f
commit
31dacf6c76
|
@ -9,6 +9,7 @@ using libsecondlife;
|
||||||
|
|
||||||
namespace OpenGrid.Framework.Communications
|
namespace OpenGrid.Framework.Communications
|
||||||
{
|
{
|
||||||
|
|
||||||
public class RegionServerCommsManager
|
public class RegionServerCommsManager
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -27,16 +27,12 @@ namespace OpenGrid.Framework.Communications
|
||||||
public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
|
public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
|
||||||
{
|
{
|
||||||
//Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
|
//Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
|
||||||
|
|
||||||
if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
|
if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
|
||||||
{
|
{
|
||||||
//Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
|
//Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
|
||||||
|
|
||||||
this.regions.Add(regionInfo.RegionHandle, regionInfo);
|
this.regions.Add(regionInfo.RegionHandle, regionInfo);
|
||||||
RegionCommsHostBase regionHost = new RegionCommsHostBase();
|
RegionCommsHostBase regionHost = new RegionCommsHostBase();
|
||||||
this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
|
this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
|
||||||
|
|
||||||
|
|
||||||
return regionHost;
|
return regionHost;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,7 +65,6 @@ namespace OpenGrid.Framework.Communications
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return neighbours;
|
return neighbours;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ using System.Text;
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
|
|
||||||
namespace OpenSim.RegionServer.Simulator
|
namespace OpenSim
|
||||||
{
|
{
|
||||||
public class AvatarAnimations
|
public class AvatarAnimations
|
||||||
{
|
{
|
||||||
|
@ -45,7 +45,7 @@ namespace OpenSim.RegionServer.Simulator
|
||||||
|
|
||||||
public void LoadAnims()
|
public void LoadAnims()
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
|
//OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
|
||||||
XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
|
XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
|
||||||
|
|
||||||
XmlDocument doc = new XmlDocument();
|
XmlDocument doc = new XmlDocument();
|
||||||
|
@ -62,9 +62,9 @@ namespace OpenSim.RegionServer.Simulator
|
||||||
|
|
||||||
reader.Close();
|
reader.Close();
|
||||||
|
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
|
// OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
|
||||||
|
|
||||||
foreach (KeyValuePair<string, LLUUID> kp in OpenSim.RegionServer.Simulator.Avatar.Animations.AnimsLLUUID)
|
foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID)
|
||||||
{
|
{
|
||||||
AnimsNames.Add(kp.Value, kp.Key);
|
AnimsNames.Add(kp.Value, kp.Key);
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue