diff options
| author | Diva Canto | 2013-07-09 14:13:51 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-09 14:13:51 -0700 |
| commit | d0dfb744b206d3bd002ed72f415f177c6b04226b (patch) | |
| tree | dba29f24667d254371abb726e2842700c189dfdf /OpenSim/Framework/DAMap.cs | |
| parent | Put guards on a bunch of exception-inducing code, as seen in logs from load t... (diff) | |
| parent | BulletSim: add parameter to optionally disable vehicle linear deflection. (diff) | |
| download | opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.zip opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.gz opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.bz2 opensim-SC_OLD-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/DAMap.cs')
| -rw-r--r-- | OpenSim/Framework/DAMap.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs index 5c729e8..4995a92 100644 --- a/OpenSim/Framework/DAMap.cs +++ b/OpenSim/Framework/DAMap.cs | |||
| @@ -132,10 +132,6 @@ namespace OpenSim.Framework | |||
| 132 | { | 132 | { |
| 133 | List<string> keysToRemove = null; | 133 | List<string> keysToRemove = null; |
| 134 | 134 | ||
| 135 | // Hard-coded special case that needs to be removed in the future. Normally, modules themselves should | ||
| 136 | // handle reading data from old locations | ||
| 137 | bool osMaterialsMigrationRequired = false; | ||
| 138 | |||
| 139 | OSDMap namespacesMap = daMap.m_map; | 135 | OSDMap namespacesMap = daMap.m_map; |
| 140 | 136 | ||
| 141 | foreach (string key in namespacesMap.Keys) | 137 | foreach (string key in namespacesMap.Keys) |