aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService/GridService.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-09-02 19:54:53 +0100
committerUbitUmarov2015-09-02 19:54:53 +0100
commita11edceb00b5b86f825bd957bdac9edb91f893dd (patch)
treec192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Services/GridService/GridService.cs
parentbad merge? (diff)
downloadopensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip
opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz
opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2
opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
-rw-r--r--OpenSim/Services/GridService/GridService.cs37
1 files changed, 4 insertions, 33 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 8293c18..8059275 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -57,13 +57,10 @@ namespace OpenSim.Services.GridService
57 protected bool m_AllowDuplicateNames = false; 57 protected bool m_AllowDuplicateNames = false;
58 protected bool m_AllowHypergridMapSearch = false; 58 protected bool m_AllowHypergridMapSearch = false;
59 59
60<<<<<<< HEAD 60
61 protected bool m_SuppressVarregionOverlapCheckOnRegistration = false; 61 protected bool m_SuppressVarregionOverlapCheckOnRegistration = false;
62 62
63 private static Dictionary<string,object> m_ExtraFeatures = new Dictionary<string, object>(); 63 private static Dictionary<string,object> m_ExtraFeatures = new Dictionary<string, object>();
64=======
65 private static Dictionary<string, object> m_ExtraFeatures = new Dictionary<string, object>();
66>>>>>>> avn/ubitvar
67 64
68 public GridService(IConfigSource config) 65 public GridService(IConfigSource config)
69 : base(config) 66 : base(config)
@@ -159,15 +156,9 @@ namespace OpenSim.Services.GridService
159 156
160 if (loginConfig == null || gridConfig == null) 157 if (loginConfig == null || gridConfig == null)
161 return; 158 return;
162<<<<<<< HEAD
163
164 string configVal;
165
166=======
167 159
168 string configVal; 160 string configVal;
169 161
170>>>>>>> avn/ubitvar
171 configVal = loginConfig.GetString("SearchURL", string.Empty); 162 configVal = loginConfig.GetString("SearchURL", string.Empty);
172 if (!string.IsNullOrEmpty(configVal)) 163 if (!string.IsNullOrEmpty(configVal))
173 m_ExtraFeatures["search-server-url"] = configVal; 164 m_ExtraFeatures["search-server-url"] = configVal;
@@ -211,22 +202,11 @@ namespace OpenSim.Services.GridService
211 if (regionInfos.RegionID == UUID.Zero) 202 if (regionInfos.RegionID == UUID.Zero)
212 return "Invalid RegionID - cannot be zero UUID"; 203 return "Invalid RegionID - cannot be zero UUID";
213 204
214<<<<<<< HEAD
215 String reason = "Region overlaps another region"; 205 String reason = "Region overlaps another region";
216 RegionData region = FindAnyConflictingRegion(regionInfos, scopeID, out reason);
217 // If there is a conflicting region, if it has the same ID and same coordinates
218 // then it is a region re-registering (permissions and ownership checked later).
219 if ((region != null)
220 && ( (region.coordX != regionInfos.RegionCoordX)
221 || (region.coordY != regionInfos.RegionCoordY)
222 || (region.RegionID != regionInfos.RegionID) )
223 )
224=======
225 // we should not need to check for overlaps 206 // we should not need to check for overlaps
226 207
227 RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); 208 RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
228 if ((region != null) && (region.RegionID != regionInfos.RegionID)) 209 if ((region != null) && (region.RegionID != regionInfos.RegionID))
229>>>>>>> avn/ubitvar
230 { 210 {
231 // If not same ID and same coordinates, this new region has conflicts and can't be registered. 211 // If not same ID and same coordinates, this new region has conflicts and can't be registered.
232 m_log.WarnFormat("{0} Register region conflict in scope {1}. {2}", LogHeader, scopeID, reason); 212 m_log.WarnFormat("{0} Register region conflict in scope {1}. {2}", LogHeader, scopeID, reason);
@@ -508,11 +488,8 @@ namespace OpenSim.Services.GridService
508 if (region != null) 488 if (region != null)
509 { 489 {
510 // Not really? Maybe? 490 // Not really? Maybe?
511<<<<<<< HEAD 491
512 // The adjacent regions are presumed to be the same size as the current region
513=======
514/* this fails wiht var regions. My_sql db should now handle var regions 492/* this fails wiht var regions. My_sql db should now handle var regions
515>>>>>>> avn/ubitvar
516 List<RegionData> rdatas = m_Database.Get( 493 List<RegionData> rdatas = m_Database.Get(
517 region.posX - region.sizeX - 1, region.posY - region.sizeY - 1, 494 region.posX - region.sizeX - 1, region.posY - region.sizeY - 1,
518 region.posX + region.sizeX + 1, region.posY + region.sizeY + 1, scopeID); 495 region.posX + region.sizeX + 1, region.posY + region.sizeY + 1, scopeID);
@@ -898,11 +875,9 @@ namespace OpenSim.Services.GridService
898 return; 875 return;
899 } 876 }
900 877
901<<<<<<< HEAD 878
902 RegionData region = m_Database.Get((int)Util.RegionToWorldLoc(x), (int)Util.RegionToWorldLoc(y), UUID.Zero); 879 RegionData region = m_Database.Get((int)Util.RegionToWorldLoc(x), (int)Util.RegionToWorldLoc(y), UUID.Zero);
903======= 880
904 RegionData region = m_Database.Get((int)Util.RegionToWorldLoc((uint)x), (int)Util.RegionToWorldLoc((uint)y), UUID.Zero);
905>>>>>>> avn/ubitvar
906 if (region == null) 881 if (region == null)
907 { 882 {
908 MainConsole.Instance.OutputFormat("No region found at {0},{1}", x, y); 883 MainConsole.Instance.OutputFormat("No region found at {0},{1}", x, y);
@@ -919,11 +894,7 @@ namespace OpenSim.Services.GridService
919 ConsoleDisplayList dispList = new ConsoleDisplayList(); 894 ConsoleDisplayList dispList = new ConsoleDisplayList();
920 dispList.AddRow("Region Name", r.RegionName); 895 dispList.AddRow("Region Name", r.RegionName);
921 dispList.AddRow("Region ID", r.RegionID); 896 dispList.AddRow("Region ID", r.RegionID);
922<<<<<<< HEAD
923 dispList.AddRow("Position", string.Format("{0},{1}", r.coordX, r.coordY));
924=======
925 dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY)); 897 dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY));
926>>>>>>> avn/ubitvar
927 dispList.AddRow("Size", string.Format("{0}x{1}", r.sizeX, r.sizeY)); 898 dispList.AddRow("Size", string.Format("{0}x{1}", r.sizeX, r.sizeY));
928 dispList.AddRow("URI", r.Data["serverURI"]); 899 dispList.AddRow("URI", r.Data["serverURI"]);
929 dispList.AddRow("Owner ID", r.Data["owner_uuid"]); 900 dispList.AddRow("Owner ID", r.Data["owner_uuid"]);