OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
cpu-performance
Justin Clark-Casey (justincc) 2013-06-29 00:23:41 +01:00
parent 371085546d
commit 3a634c56e3
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/DAMap.cs
View File

@ -148,10 +148,6 @@ namespace OpenSim.Framework
keysToRemove.Add(key); keysToRemove.Add(key);
} }
else if (key == "OS:Materials")
{
osMaterialsMigrationRequired = true;
}
} }
if (keysToRemove != null) if (keysToRemove != null)
@ -163,11 +159,6 @@ namespace OpenSim.Framework
} }
} }
// Hard-coded special case that needs to be removed in the future. Normally, modules themselves should
// handle reading data from old locations
if (osMaterialsMigrationRequired)
daMap.SetStore("OpenSim", "Materials", (OSDMap)namespacesMap["OS:Materials"]);
foreach (OSD nsOsd in namespacesMap.Values) foreach (OSD nsOsd in namespacesMap.Values)
{ {
OSDMap nsOsdMap = (OSDMap)nsOsd; OSDMap nsOsdMap = (OSDMap)nsOsd;