diff options
author | Justin Clark-Casey (justincc) | 2013-06-29 00:23:41 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-06-29 00:23:41 +0100 |
commit | 3a634c56e344dcaa9bf089168bed185cee4527bf (patch) | |
tree | 92a4942ef01fa722d98486286872143b86bcda74 /OpenSim/Framework/DAMap.cs | |
parent | Add materials store null check into UuidGatherer code. (diff) | |
download | opensim-SC_OLD-3a634c56e344dcaa9bf089168bed185cee4527bf.zip opensim-SC_OLD-3a634c56e344dcaa9bf089168bed185cee4527bf.tar.gz opensim-SC_OLD-3a634c56e344dcaa9bf089168bed185cee4527bf.tar.bz2 opensim-SC_OLD-3a634c56e344dcaa9bf089168bed185cee4527bf.tar.xz |
Remove hack to migrate previous experimental-level os materials data.
This didn't seem to be working anyway and it's better not to have such hacks in the code for experimental stuff.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/DAMap.cs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs index fd45a11..5c729e8 100644 --- a/OpenSim/Framework/DAMap.cs +++ b/OpenSim/Framework/DAMap.cs | |||
@@ -148,10 +148,6 @@ namespace OpenSim.Framework | |||
148 | 148 | ||
149 | keysToRemove.Add(key); | 149 | keysToRemove.Add(key); |
150 | } | 150 | } |
151 | else if (key == "OS:Materials") | ||
152 | { | ||
153 | osMaterialsMigrationRequired = true; | ||
154 | } | ||
155 | } | 151 | } |
156 | 152 | ||
157 | if (keysToRemove != null) | 153 | if (keysToRemove != null) |
@@ -163,11 +159,6 @@ namespace OpenSim.Framework | |||
163 | } | 159 | } |
164 | } | 160 | } |
165 | 161 | ||
166 | // Hard-coded special case that needs to be removed in the future. Normally, modules themselves should | ||
167 | // handle reading data from old locations | ||
168 | if (osMaterialsMigrationRequired) | ||
169 | daMap.SetStore("OpenSim", "Materials", (OSDMap)namespacesMap["OS:Materials"]); | ||
170 | |||
171 | foreach (OSD nsOsd in namespacesMap.Values) | 162 | foreach (OSD nsOsd in namespacesMap.Values) |
172 | { | 163 | { |
173 | OSDMap nsOsdMap = (OSDMap)nsOsd; | 164 | OSDMap nsOsdMap = (OSDMap)nsOsd; |