diff options
author | Diva Canto | 2014-11-11 20:42:13 -0800 |
---|---|---|
committer | Diva Canto | 2014-11-11 20:42:13 -0800 |
commit | 32293cfd6ba20cc5cab0a5acba587edea2582324 (patch) | |
tree | f22e6593deb43629b0c89cbeb941c90f8517be79 /OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-32293cfd6ba20cc5cab0a5acba587edea2582324.zip opensim-SC_OLD-32293cfd6ba20cc5cab0a5acba587edea2582324.tar.gz opensim-SC_OLD-32293cfd6ba20cc5cab0a5acba587edea2582324.tar.bz2 opensim-SC_OLD-32293cfd6ba20cc5cab0a5acba587edea2582324.tar.xz |
Fix the fetching of module references in the viewer support modules.
Remove the detachment of attachments in camera-only, because it doesn't work for HG people, and it's too drastic of a move.
Diffstat (limited to 'OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs index 6415c6c..0a8c83a 100644 --- a/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs +++ b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs | |||
@@ -95,8 +95,6 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport | |||
95 | if (m_Enabled) | 95 | if (m_Enabled) |
96 | { | 96 | { |
97 | m_scene = scene; | 97 | m_scene = scene; |
98 | IEntityTransferModule et = m_scene.RequestModuleInterface<IEntityTransferModule>(); | ||
99 | m_Helper = new SimulatorFeaturesHelper(scene, et); | ||
100 | } | 98 | } |
101 | } | 99 | } |
102 | 100 | ||
@@ -104,9 +102,11 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport | |||
104 | { | 102 | { |
105 | if (m_Enabled) | 103 | if (m_Enabled) |
106 | { | 104 | { |
107 | ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>(); | 105 | IEntityTransferModule et = m_scene.RequestModuleInterface<IEntityTransferModule>(); |
106 | m_Helper = new SimulatorFeaturesHelper(scene, et); | ||
108 | 107 | ||
109 | if (featuresModule != null && m_Enabled) | 108 | ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>(); |
109 | if (featuresModule != null) | ||
110 | featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest; | 110 | featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest; |
111 | } | 111 | } |
112 | } | 112 | } |