aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs21
1 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 1de30af..f71ee86 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -143,6 +143,7 @@ namespace OpenSim.Framework
143 public string RemotingAddress; 143 public string RemotingAddress;
144 public UUID ScopeID = UUID.Zero; 144 public UUID ScopeID = UUID.Zero;
145 private UUID m_maptileStaticUUID = UUID.Zero; 145 private UUID m_maptileStaticUUID = UUID.Zero;
146 public string m_maptileStaticFile;
146 147
147 public uint WorldLocX = 0; 148 public uint WorldLocX = 0;
148 public uint WorldLocY = 0; 149 public uint WorldLocY = 0;
@@ -349,6 +350,11 @@ namespace OpenSim.Framework
349 { 350 {
350 get { return m_maptileStaticUUID; } 351 get { return m_maptileStaticUUID; }
351 } 352 }
353
354 public string MaptileStaticFile
355 {
356 get { return m_maptileStaticFile; }
357 }
352 358
353 /// <summary> 359 /// <summary>
354 /// The port by which http communication occurs with the region (most noticeably, CAPS communication) 360 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
@@ -716,6 +722,9 @@ namespace OpenSim.Framework
716 { 722 {
717 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); 723 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
718 } 724 }
725
726 m_maptileStaticFile = config.GetString("MaptileStaticFile", String.Empty);
727 allKeys.Remove("MaptileStaticFile");
719 728
720 #endregion 729 #endregion
721 730
@@ -843,6 +852,9 @@ namespace OpenSim.Framework
843 852
844 if (m_maptileStaticUUID != UUID.Zero) 853 if (m_maptileStaticUUID != UUID.Zero)
845 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); 854 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
855
856 if (m_maptileStaticFile != String.Empty)
857 config.Set("MaptileStaticFile", m_maptileStaticFile);
846 } 858 }
847 859
848 public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result) 860 public bool ignoreIncomingConfiguration(string configuration_key, object configuration_result)
@@ -952,6 +964,9 @@ namespace OpenSim.Framework
952 964
953 configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 965 configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
954 "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true); 966 "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true);
967
968 configMember.addConfigurationOption("region_static_mapfile", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
969 "Filename of a texture to use as the map for this region", m_maptileStaticFile, true);
955 } 970 }
956 971
957 public void loadConfigurationOptions() 972 public void loadConfigurationOptions()
@@ -1016,6 +1031,9 @@ namespace OpenSim.Framework
1016 1031
1017 configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID, 1032 configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
1018 "UUID of a texture to use as the map for this region", String.Empty, true); 1033 "UUID of a texture to use as the map for this region", String.Empty, true);
1034
1035 configMember.addConfigurationOption("region_static_mapfile", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
1036 "Filename of a texture to use as the map for this region", String.Empty, true);
1019 } 1037 }
1020 1038
1021 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 1039 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -1097,6 +1115,9 @@ namespace OpenSim.Framework
1097 case "region_static_maptile": 1115 case "region_static_maptile":
1098 m_maptileStaticUUID = (UUID)configuration_result; 1116 m_maptileStaticUUID = (UUID)configuration_result;
1099 break; 1117 break;
1118 case "region_static_mapfile":
1119 m_maptileStaticFile = (string)configuration_result;
1120 break;
1100 } 1121 }
1101 1122
1102 return true; 1123 return true;