diff options
author | UbitUmarov | 2019-09-09 15:52:50 +0100 |
---|---|---|
committer | UbitUmarov | 2019-09-09 15:52:50 +0100 |
commit | 6aa369d8586a7e411757a6364e083a3d22166dcf (patch) | |
tree | 3e0fbb30f2763799fb29ccdb7467ffa90a19a50c /OpenSim/Region/ClientStack/Linden/Caps | |
parent | fix a HG to local grid tp extra check (diff) | |
download | opensim-SC-6aa369d8586a7e411757a6364e083a3d22166dcf.zip opensim-SC-6aa369d8586a7e411757a6364e083a3d22166dcf.tar.gz opensim-SC-6aa369d8586a7e411757a6364e083a3d22166dcf.tar.bz2 opensim-SC-6aa369d8586a7e411757a6364e083a3d22166dcf.tar.xz |
disable AvatarHoverHeight useless and viewer side broken (without SSA)
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs index b0ba5a3..ea107de 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs | |||
@@ -77,9 +77,11 @@ namespace OpenSim.Region.ClientStack.LindenCaps | |||
77 | { | 77 | { |
78 | RegisterCaps(agentID, caps); | 78 | RegisterCaps(agentID, caps); |
79 | }; | 79 | }; |
80 | /* | ||
80 | ISimulatorFeaturesModule simFeatures = scene.RequestModuleInterface<ISimulatorFeaturesModule>(); | 81 | ISimulatorFeaturesModule simFeatures = scene.RequestModuleInterface<ISimulatorFeaturesModule>(); |
81 | if(simFeatures != null) | 82 | if(simFeatures != null) |
82 | simFeatures.AddFeature("AvatarHoverHeightEnabled",OSD.FromBoolean(true)); | 83 | simFeatures.AddFeature("AvatarHoverHeightEnabled",OSD.FromBoolean(true)); |
84 | */ | ||
83 | } | 85 | } |
84 | 86 | ||
85 | public void PostInitialise() {} | 87 | public void PostInitialise() {} |
@@ -122,7 +124,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps | |||
122 | public string UpdateAgentPreferences(string request, string path, string param, UUID agent) | 124 | public string UpdateAgentPreferences(string request, string path, string param, UUID agent) |
123 | { | 125 | { |
124 | OSDMap resp = new OSDMap(); | 126 | OSDMap resp = new OSDMap(); |
125 | // The viewer doesn't do much with the return value, so for now, if there is no preference service, | 127 | // if there is no preference service, |
126 | // we'll return a null llsd block for debugging purposes. This may change if someone knows what the | 128 | // we'll return a null llsd block for debugging purposes. This may change if someone knows what the |
127 | // correct server response would be here. | 129 | // correct server response would be here. |
128 | if (m_scenes[0].AgentPreferencesService == null) | 130 | if (m_scenes[0].AgentPreferencesService == null) |
@@ -151,6 +153,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps | |||
151 | } | 153 | } |
152 | if (req.ContainsKey("hover_height")) | 154 | if (req.ContainsKey("hover_height")) |
153 | { | 155 | { |
156 | //data.HoverHeight = (float)req["hover_height"].AsReal(); | ||
154 | data.HoverHeight = req["hover_height"].AsReal(); | 157 | data.HoverHeight = req["hover_height"].AsReal(); |
155 | } | 158 | } |
156 | if (req.ContainsKey("language")) | 159 | if (req.ContainsKey("language")) |
@@ -174,7 +177,10 @@ namespace OpenSim.Region.ClientStack.LindenCaps | |||
174 | resp["hover_height"] = data.HoverHeight; | 177 | resp["hover_height"] = data.HoverHeight; |
175 | resp["language"] = data.Language; | 178 | resp["language"] = data.Language; |
176 | resp["language_is_public"] = data.LanguageIsPublic; | 179 | resp["language_is_public"] = data.LanguageIsPublic; |
177 | 180 | /* | |
181 | IAvatarFactoryModule afm = m_scenes[0].RequestModuleInterface<IAvatarFactoryModule>(); | ||
182 | afm?.SetPreferencesHoverZ(agent, (float)data.HoverHeight); | ||
183 | */ | ||
178 | string response = OSDParser.SerializeLLSDXmlString(resp); | 184 | string response = OSDParser.SerializeLLSDXmlString(resp); |
179 | return response; | 185 | return response; |
180 | } | 186 | } |