From 3a634c56e344dcaa9bf089168bed185cee4527bf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 29 Jun 2013 00:23:41 +0100
Subject: 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.
---
 OpenSim/Framework/DAMap.cs | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'OpenSim/Framework/DAMap.cs')

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
 
                     keysToRemove.Add(key);
                 }
-                else if (key == "OS:Materials")
-                {
-                    osMaterialsMigrationRequired = true;
-                }
             }
 
             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)
             {
                 OSDMap nsOsdMap = (OSDMap)nsOsd;
-- 
cgit v1.1