diff options
author | Jak Daniels | 2013-01-30 21:43:35 +0000 |
---|---|---|
committer | BlueWall | 2013-01-30 23:37:02 -0500 |
commit | fac72d540b029ba72195dca69c56034167835d60 (patch) | |
tree | 392b165533aa772690ff222de34fd1866d681139 /OpenSim/Framework | |
parent | * This adds a bit more to the previous flying roll effect by adding additiona... (diff) | |
download | opensim-SC_OLD-fac72d540b029ba72195dca69c56034167835d60.zip opensim-SC_OLD-fac72d540b029ba72195dca69c56034167835d60.tar.gz opensim-SC_OLD-fac72d540b029ba72195dca69c56034167835d60.tar.bz2 opensim-SC_OLD-fac72d540b029ba72195dca69c56034167835d60.tar.xz |
Allow use of MaptileStaticUUID in Regions.ini to override the global setting in OpenSim.ini for each region.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 016f2a6..24b9c89 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -143,6 +143,7 @@ namespace OpenSim.Framework | |||
143 | public UUID RegionID = UUID.Zero; | 143 | public UUID RegionID = UUID.Zero; |
144 | public string RemotingAddress; | 144 | public string RemotingAddress; |
145 | public UUID ScopeID = UUID.Zero; | 145 | public UUID ScopeID = UUID.Zero; |
146 | private UUID m_maptileStaticUUID = UUID.Zero; | ||
146 | 147 | ||
147 | private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>(); | 148 | private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>(); |
148 | 149 | ||
@@ -338,6 +339,11 @@ namespace OpenSim.Framework | |||
338 | get { return m_regionType; } | 339 | get { return m_regionType; } |
339 | } | 340 | } |
340 | 341 | ||
342 | public UUID MaptileStaticUUID | ||
343 | { | ||
344 | get { return m_maptileStaticUUID; } | ||
345 | } | ||
346 | |||
341 | /// <summary> | 347 | /// <summary> |
342 | /// The port by which http communication occurs with the region (most noticeably, CAPS communication) | 348 | /// The port by which http communication occurs with the region (most noticeably, CAPS communication) |
343 | /// </summary> | 349 | /// </summary> |
@@ -641,7 +647,7 @@ namespace OpenSim.Framework | |||
641 | m_regionType = config.GetString("RegionType", String.Empty); | 647 | m_regionType = config.GetString("RegionType", String.Empty); |
642 | allKeys.Remove("RegionType"); | 648 | allKeys.Remove("RegionType"); |
643 | 649 | ||
644 | #region Prim stuff | 650 | #region Prim and map stuff |
645 | 651 | ||
646 | m_nonphysPrimMin = config.GetFloat("NonPhysicalPrimMin", 0); | 652 | m_nonphysPrimMin = config.GetFloat("NonPhysicalPrimMin", 0); |
647 | allKeys.Remove("NonPhysicalPrimMin"); | 653 | allKeys.Remove("NonPhysicalPrimMin"); |
@@ -663,6 +669,13 @@ namespace OpenSim.Framework | |||
663 | 669 | ||
664 | m_linksetCapacity = config.GetInt("LinksetPrims", 0); | 670 | m_linksetCapacity = config.GetInt("LinksetPrims", 0); |
665 | allKeys.Remove("LinksetPrims"); | 671 | allKeys.Remove("LinksetPrims"); |
672 | |||
673 | allKeys.Remove("MaptileStaticUUID"); | ||
674 | string mapTileStaticUUID = config.GetString("MaptileStaticUUID", UUID.Zero.ToString()); | ||
675 | if (UUID.TryParse(mapTileStaticUUID.Trim(), out m_maptileStaticUUID)) | ||
676 | { | ||
677 | config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); | ||
678 | } | ||
666 | 679 | ||
667 | #endregion | 680 | #endregion |
668 | 681 | ||
@@ -729,6 +742,9 @@ namespace OpenSim.Framework | |||
729 | 742 | ||
730 | if (RegionType != String.Empty) | 743 | if (RegionType != String.Empty) |
731 | config.Set("RegionType", RegionType); | 744 | config.Set("RegionType", RegionType); |
745 | |||
746 | if (m_maptileStaticUUID != UUID.Zero) | ||
747 | config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); | ||
732 | } | 748 | } |
733 | 749 | ||
734 | public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result) | 750 | public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -827,6 +843,9 @@ namespace OpenSim.Framework | |||
827 | 843 | ||
828 | configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 844 | configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
829 | "Free form string describing the type of region", String.Empty, true); | 845 | "Free form string describing the type of region", String.Empty, true); |
846 | |||
847 | configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID, | ||
848 | "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true); | ||
830 | } | 849 | } |
831 | 850 | ||
832 | public void loadConfigurationOptions() | 851 | public void loadConfigurationOptions() |
@@ -880,6 +899,9 @@ namespace OpenSim.Framework | |||
880 | 899 | ||
881 | configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 900 | configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
882 | "Region Type", String.Empty, true); | 901 | "Region Type", String.Empty, true); |
902 | |||
903 | configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID, | ||
904 | "UUID of a texture to use as the map for this region", String.Empty, true); | ||
883 | } | 905 | } |
884 | 906 | ||
885 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 907 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -949,6 +971,9 @@ namespace OpenSim.Framework | |||
949 | case "region_type": | 971 | case "region_type": |
950 | m_regionType = (string)configuration_result; | 972 | m_regionType = (string)configuration_result; |
951 | break; | 973 | break; |
974 | case "region_static_maptile": | ||
975 | m_maptileStaticUUID = (UUID)configuration_result; | ||
976 | break; | ||
952 | } | 977 | } |
953 | 978 | ||
954 | return true; | 979 | return true; |