aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-06-08 16:01:15 +0000
committerMW2007-06-08 16:01:15 +0000
commit31dacf6c763742363655367fd4e1f9d298daf1e0 (patch)
treeb7cade16130fb28645e3d50a6bf1837a87fb3af2
parent*Added libraries to bin (diff)
downloadopensim-SC_OLD-31dacf6c763742363655367fd4e1f9d298daf1e0.zip
opensim-SC_OLD-31dacf6c763742363655367fd4e1f9d298daf1e0.tar.gz
opensim-SC_OLD-31dacf6c763742363655367fd4e1f9d298daf1e0.tar.bz2
opensim-SC_OLD-31dacf6c763742363655367fd4e1f9d298daf1e0.tar.xz
Added prebuild.exe and fixed a couple of namespace problems in AvatarAnimations.cs.
Now need to update prebuild.xml
Diffstat (limited to '')
-rw-r--r--Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs1
-rw-r--r--Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs7
-rw-r--r--OpenSim/OpenSim.World/AvatarAnimations.cs8
-rw-r--r--bin/Prebuild.exebin0 -> 176128 bytes
4 files changed, 6 insertions, 10 deletions
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
index 0b2b72e..fa786d3 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
@@ -9,6 +9,7 @@ using libsecondlife;
9 9
10namespace OpenGrid.Framework.Communications 10namespace OpenGrid.Framework.Communications
11{ 11{
12
12 public class RegionServerCommsManager 13 public class RegionServerCommsManager
13 { 14 {
14 15
diff --git a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs b/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs
index c82c820..fad2001 100644
--- a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs
@@ -27,16 +27,12 @@ namespace OpenGrid.Framework.Communications
27 public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo) 27 public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
28 { 28 {
29 //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering"); 29 //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
30
31 if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle)) 30 if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
32 { 31 {
33 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle ); 32 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
34
35 this.regions.Add(regionInfo.RegionHandle, regionInfo); 33 this.regions.Add(regionInfo.RegionHandle, regionInfo);
36 RegionCommsHostBase regionHost = new RegionCommsHostBase(); 34 RegionCommsHostBase regionHost = new RegionCommsHostBase();
37 this.regionHosts.Add(regionInfo.RegionHandle, regionHost); 35 this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
38
39
40 return regionHost; 36 return regionHost;
41 } 37 }
42 38
@@ -69,7 +65,6 @@ namespace OpenGrid.Framework.Communications
69 } 65 }
70 } 66 }
71 } 67 }
72
73 return neighbours; 68 return neighbours;
74 } 69 }
75 70
diff --git a/OpenSim/OpenSim.World/AvatarAnimations.cs b/OpenSim/OpenSim.World/AvatarAnimations.cs
index c7557dc..f13646d 100644
--- a/OpenSim/OpenSim.World/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.World/AvatarAnimations.cs
@@ -31,7 +31,7 @@ using System.Text;
31using libsecondlife; 31using libsecondlife;
32using System.Xml; 32using System.Xml;
33 33
34namespace OpenSim.RegionServer.Simulator 34namespace OpenSim
35{ 35{
36 public class AvatarAnimations 36 public class AvatarAnimations
37 { 37 {
@@ -45,7 +45,7 @@ namespace OpenSim.RegionServer.Simulator
45 45
46 public void LoadAnims() 46 public void LoadAnims()
47 { 47 {
48 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations"); 48 //OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
49 XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"); 49 XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
50 50
51 XmlDocument doc = new XmlDocument(); 51 XmlDocument doc = new XmlDocument();
@@ -62,9 +62,9 @@ namespace OpenSim.RegionServer.Simulator
62 62
63 reader.Close(); 63 reader.Close();
64 64
65 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 65 // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
66 66
67 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.RegionServer.Simulator.Avatar.Animations.AnimsLLUUID) 67 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID)
68 { 68 {
69 AnimsNames.Add(kp.Value, kp.Key); 69 AnimsNames.Add(kp.Value, kp.Key);
70 } 70 }
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
new file mode 100644
index 0000000..4717d79
--- /dev/null
+++ b/bin/Prebuild.exe
Binary files differ