diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Services/GridService | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 37 | ||||
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 33 |
2 files changed, 5 insertions, 65 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"]); |
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index b4577b0..5d9931b 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -343,11 +343,7 @@ namespace OpenSim.Services.GridService | |||
343 | GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY); | 343 | GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY); |
344 | if (region != null) | 344 | if (region != null) |
345 | { | 345 | { |
346 | <<<<<<< HEAD | ||
347 | m_log.WarnFormat("[HYPERGRID LINKER]: Coordinates <{0},{1}> are already occupied by region {2} with uuid {3}", | ||
348 | ======= | ||
349 | m_log.WarnFormat("[HYPERGRID LINKER]: Coordinates {0}-{1} are already occupied by region {2} with uuid {3}", | 346 | m_log.WarnFormat("[HYPERGRID LINKER]: Coordinates {0}-{1} are already occupied by region {2} with uuid {3}", |
350 | >>>>>>> avn/ubitvar | ||
351 | Util.WorldToRegionLoc((uint)regInfo.RegionLocX), Util.WorldToRegionLoc((uint)regInfo.RegionLocY), | 347 | Util.WorldToRegionLoc((uint)regInfo.RegionLocX), Util.WorldToRegionLoc((uint)regInfo.RegionLocY), |
352 | region.RegionName, region.RegionID); | 348 | region.RegionName, region.RegionID); |
353 | reason = "Coordinates are already in use"; | 349 | reason = "Coordinates are already in use"; |
@@ -383,13 +379,8 @@ namespace OpenSim.Services.GridService | |||
383 | region = m_GridService.GetRegionByUUID(scopeID, regionID); | 379 | region = m_GridService.GetRegionByUUID(scopeID, regionID); |
384 | if (region != null) | 380 | if (region != null) |
385 | { | 381 | { |
386 | <<<<<<< HEAD | 382 | m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates <{0},{1}>", |
387 | m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates <{0},{1}>", | ||
388 | Util.WorldToRegionLoc((uint)region.RegionLocX), Util.WorldToRegionLoc((uint)region.RegionLocY)); | 383 | Util.WorldToRegionLoc((uint)region.RegionLocX), Util.WorldToRegionLoc((uint)region.RegionLocY)); |
389 | ======= | ||
390 | m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates {0} {1}", | ||
391 | Util.WorldToRegionLoc((uint)regInfo.RegionLocX), Util.WorldToRegionLoc((uint)regInfo.RegionLocY)); | ||
392 | >>>>>>> avn/ubitvar | ||
393 | regInfo = region; | 384 | regInfo = region; |
394 | return true; | 385 | return true; |
395 | } | 386 | } |
@@ -545,7 +536,6 @@ namespace OpenSim.Services.GridService | |||
545 | MainConsole.Instance.Output(new string('-', 72)); | 536 | MainConsole.Instance.Output(new string('-', 72)); |
546 | foreach (RegionData r in regions) | 537 | foreach (RegionData r in regions) |
547 | { | 538 | { |
548 | <<<<<<< HEAD | ||
549 | MainConsole.Instance.Output( | 539 | MainConsole.Instance.Output( |
550 | String.Format("{0}\n{2,-32} {1}\n", | 540 | String.Format("{0}\n{2,-32} {1}\n", |
551 | r.RegionName, r.RegionID, | 541 | r.RegionName, r.RegionID, |
@@ -554,12 +544,6 @@ namespace OpenSim.Services.GridService | |||
554 | ) | 544 | ) |
555 | ) | 545 | ) |
556 | ); | 546 | ); |
557 | ======= | ||
558 | MainConsole.Instance.Output(String.Format("{0}\n{2,-32} {1}\n", | ||
559 | r.RegionName, r.RegionID, | ||
560 | String.Format("{0},{1} ({2},{3})", r.posX, r.posY, | ||
561 | Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY))) ); | ||
562 | >>>>>>> avn/ubitvar | ||
563 | } | 547 | } |
564 | return; | 548 | return; |
565 | } | 549 | } |
@@ -661,13 +645,8 @@ namespace OpenSim.Services.GridService | |||
661 | string externalHostName; | 645 | string externalHostName; |
662 | try | 646 | try |
663 | { | 647 | { |
664 | <<<<<<< HEAD | ||
665 | xloc = Convert.ToUInt32(cmdparams[0]); | 648 | xloc = Convert.ToUInt32(cmdparams[0]); |
666 | yloc = Convert.ToUInt32(cmdparams[1]); | 649 | yloc = Convert.ToUInt32(cmdparams[1]); |
667 | ======= | ||
668 | xloc = (uint)Convert.ToInt32(cmdparams[0]); | ||
669 | yloc = (uint)Convert.ToInt32(cmdparams[1]); | ||
670 | >>>>>>> avn/ubitvar | ||
671 | externalPort = Convert.ToUInt32(cmdparams[3]); | 650 | externalPort = Convert.ToUInt32(cmdparams[3]); |
672 | externalHostName = cmdparams[2]; | 651 | externalHostName = cmdparams[2]; |
673 | //internalPort = Convert.ToUInt32(cmdparams[4]); | 652 | //internalPort = Convert.ToUInt32(cmdparams[4]); |
@@ -770,13 +749,8 @@ namespace OpenSim.Services.GridService | |||
770 | string externalHostName; | 749 | string externalHostName; |
771 | uint realXLoc, realYLoc; | 750 | uint realXLoc, realYLoc; |
772 | 751 | ||
773 | <<<<<<< HEAD | ||
774 | xloc = Convert.ToUInt32(config.GetString("xloc", "0")); | 752 | xloc = Convert.ToUInt32(config.GetString("xloc", "0")); |
775 | yloc = Convert.ToUInt32(config.GetString("yloc", "0")); | 753 | yloc = Convert.ToUInt32(config.GetString("yloc", "0")); |
776 | ======= | ||
777 | xloc = (uint)Convert.ToInt32(config.GetString("xloc", "0")); | ||
778 | yloc = (uint)Convert.ToInt32(config.GetString("yloc", "0")); | ||
779 | >>>>>>> avn/ubitvar | ||
780 | externalPort = Convert.ToUInt32(config.GetString("externalPort", "0")); | 754 | externalPort = Convert.ToUInt32(config.GetString("externalPort", "0")); |
781 | externalHostName = config.GetString("externalHostName", ""); | 755 | externalHostName = config.GetString("externalHostName", ""); |
782 | realXLoc = Convert.ToUInt32(config.GetString("real-xloc", "0")); | 756 | realXLoc = Convert.ToUInt32(config.GetString("real-xloc", "0")); |
@@ -784,13 +758,8 @@ namespace OpenSim.Services.GridService | |||
784 | 758 | ||
785 | if (m_enableAutoMapping) | 759 | if (m_enableAutoMapping) |
786 | { | 760 | { |
787 | <<<<<<< HEAD | ||
788 | xloc = (xloc % 100) + m_autoMappingX; | 761 | xloc = (xloc % 100) + m_autoMappingX; |
789 | yloc = (yloc % 100) + m_autoMappingY; | 762 | yloc = (yloc % 100) + m_autoMappingY; |
790 | ======= | ||
791 | xloc = (uint)((xloc % 100) + m_autoMappingX); | ||
792 | yloc = (uint)((yloc % 100) + m_autoMappingY); | ||
793 | >>>>>>> avn/ubitvar | ||
794 | } | 763 | } |
795 | 764 | ||
796 | if (((realXLoc == 0) && (realYLoc == 0)) || | 765 | if (((realXLoc == 0) && (realYLoc == 0)) || |