aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-17 18:42:23 +0000
committerJustin Clarke Casey2008-12-17 18:42:23 +0000
commitff7c8551bab7c8a5b7a075c8899c8aeb51035b67 (patch)
tree75b0383457f6583c65ceeffa2bcbb1904f88e897 /OpenSim/Region/Environment
parent* minor: Comment out high volume 'Getting MapItems' messages (diff)
downloadopensim-SC-ff7c8551bab7c8a5b7a075c8899c8aeb51035b67.zip
opensim-SC-ff7c8551bab7c8a5b7a075c8899c8aeb51035b67.tar.gz
opensim-SC-ff7c8551bab7c8a5b7a075c8899c8aeb51035b67.tar.bz2
opensim-SC-ff7c8551bab7c8a5b7a075c8899c8aeb51035b67.tar.xz
* remove mono compiler warnings
* should work - the last compile failure looks like a random glitch...
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs34
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
2 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 10b0759..b533bb7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Environment.Scenes
71 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; 71 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
72 private RegionUp handlerRegionUp = null; // OnRegionUp; 72 private RegionUp handlerRegionUp = null; // OnRegionUp;
73 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; 73 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
74 private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar; 74 //private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;
75 private LogOffUser handlerLogOffUser = null; 75 private LogOffUser handlerLogOffUser = null;
76 private GetLandData handlerGetLandData = null; // OnGetLandData 76 private GetLandData handlerGetLandData = null; // OnGetLandData
77 77
@@ -904,10 +904,10 @@ namespace OpenSim.Region.Environment.Scenes
904 return currentNeighbours.FindAll(delegate(ulong handle) { return !previousNeighbours.Contains(handle); }); 904 return currentNeighbours.FindAll(delegate(ulong handle) { return !previousNeighbours.Contains(handle); });
905 } 905 }
906 906
907 private List<ulong> CommonNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours) 907// private List<ulong> CommonNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
908 { 908// {
909 return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); }); 909// return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); });
910 } 910// }
911 911
912 private List<ulong> OldNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours) 912 private List<ulong> OldNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
913 { 913 {
@@ -985,17 +985,17 @@ namespace OpenSim.Region.Environment.Scenes
985 return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber); 985 return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber);
986 } 986 }
987 987
988 private void Dump(string msg, List<ulong> handles) 988// private void Dump(string msg, List<ulong> handles)
989 { 989// {
990 Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg); 990// Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg);
991 foreach (ulong handle in handles) 991// foreach (ulong handle in handles)
992 { 992// {
993 uint x, y; 993// uint x, y;
994 Utils.LongToUInts(handle, out x, out y); 994// Utils.LongToUInts(handle, out x, out y);
995 x = x / Constants.RegionSize; 995// x = x / Constants.RegionSize;
996 y = y / Constants.RegionSize; 996// y = y / Constants.RegionSize;
997 Console.WriteLine("({0}, {1})", x, y); 997// Console.WriteLine("({0}, {1})", x, y);
998 } 998// }
999 } 999// }
1000 } 1000 }
1001} 1001}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index c0779f2..8f6872e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1932,7 +1932,6 @@ namespace OpenSim.Region.Environment.Scenes
1932 1932
1933 #region Overridden Methods 1933 #region Overridden Methods
1934 1934
1935 int x = 0;
1936 public override void Update() 1935 public override void Update()
1937 { 1936 {
1938 SendPrimUpdates(); 1937 SendPrimUpdates();
@@ -2436,7 +2435,8 @@ namespace OpenSim.Region.Environment.Scenes
2436 // Next, let's close the child agent connections that are too far away. 2435 // Next, let's close the child agent connections that are too far away.
2437 CloseChildAgents(neighbourx, neighboury); 2436 CloseChildAgents(neighbourx, neighboury);
2438 2437
2439 AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo(); 2438 //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
2439 m_controllingClient.RequestClientInfo();
2440 2440
2441 //Console.WriteLine("BEFORE CROSS"); 2441 //Console.WriteLine("BEFORE CROSS");
2442 //Scene.DumpChildrenSeeds(UUID); 2442 //Scene.DumpChildrenSeeds(UUID);