diff options
| author | dahlia | 2015-02-05 13:44:39 -0800 |
|---|---|---|
| committer | dahlia | 2015-02-05 13:44:39 -0800 |
| commit | 95a0f0d47b1e4150be21779ae5bad1a6b7a1d469 (patch) | |
| tree | e7ad31daad83d7d9219cac2803a9949b8d86ba7f /OpenSim/Region | |
| parent | Allow MaterialsModule to be enabled by default if [Materials] is absent from ... (diff) | |
| download | opensim-SC_OLD-95a0f0d47b1e4150be21779ae5bad1a6b7a1d469.zip opensim-SC_OLD-95a0f0d47b1e4150be21779ae5bad1a6b7a1d469.tar.gz opensim-SC_OLD-95a0f0d47b1e4150be21779ae5bad1a6b7a1d469.tar.bz2 opensim-SC_OLD-95a0f0d47b1e4150be21779ae5bad1a6b7a1d469.tar.xz | |
replace accidently deleted line from last commit
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs index 739eb2c..3ce6178 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | |||
| @@ -66,6 +66,8 @@ namespace OpenSim.Region.OptionalModules.Materials | |||
| 66 | private Scene m_scene = null; | 66 | private Scene m_scene = null; |
| 67 | private bool m_enabled = false; | 67 | private bool m_enabled = false; |
| 68 | 68 | ||
| 69 | public Dictionary<UUID, OSDMap> m_regionMaterials = new Dictionary<UUID, OSDMap>(); | ||
| 70 | |||
| 69 | public void Initialise(IConfigSource source) | 71 | public void Initialise(IConfigSource source) |
| 70 | { | 72 | { |
| 71 | m_enabled = true; // default is enabled | 73 | m_enabled = true; // default is enabled |