OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable AvatarHoverHeight useless and viewer side broken (without SSA)

0.9.1.0-post-fixes
UbitUmarov 2019-09-09 15:52:50 +01:00
parent 304d72565d
commit 6aa369d858
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
View File

@ -77,9 +77,11 @@ namespace OpenSim.Region.ClientStack.LindenCaps
{ {
RegisterCaps(agentID, caps); RegisterCaps(agentID, caps);
}; };
/*
ISimulatorFeaturesModule simFeatures = scene.RequestModuleInterface<ISimulatorFeaturesModule>(); ISimulatorFeaturesModule simFeatures = scene.RequestModuleInterface<ISimulatorFeaturesModule>();
if(simFeatures != null) if(simFeatures != null)
simFeatures.AddFeature("AvatarHoverHeightEnabled",OSD.FromBoolean(true)); simFeatures.AddFeature("AvatarHoverHeightEnabled",OSD.FromBoolean(true));
*/
} }
public void PostInitialise() {} public void PostInitialise() {}
@ -122,7 +124,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps
public string UpdateAgentPreferences(string request, string path, string param, UUID agent) public string UpdateAgentPreferences(string request, string path, string param, UUID agent)
{ {
OSDMap resp = new OSDMap(); OSDMap resp = new OSDMap();
// The viewer doesn't do much with the return value, so for now, if there is no preference service, // if there is no preference service,
// we'll return a null llsd block for debugging purposes. This may change if someone knows what the // we'll return a null llsd block for debugging purposes. This may change if someone knows what the
// correct server response would be here. // correct server response would be here.
if (m_scenes[0].AgentPreferencesService == null) if (m_scenes[0].AgentPreferencesService == null)
@ -151,6 +153,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps
} }
if (req.ContainsKey("hover_height")) if (req.ContainsKey("hover_height"))
{ {
//data.HoverHeight = (float)req["hover_height"].AsReal();
data.HoverHeight = req["hover_height"].AsReal(); data.HoverHeight = req["hover_height"].AsReal();
} }
if (req.ContainsKey("language")) if (req.ContainsKey("language"))
@ -174,7 +177,10 @@ namespace OpenSim.Region.ClientStack.LindenCaps
resp["hover_height"] = data.HoverHeight; resp["hover_height"] = data.HoverHeight;
resp["language"] = data.Language; resp["language"] = data.Language;
resp["language_is_public"] = data.LanguageIsPublic; resp["language_is_public"] = data.LanguageIsPublic;
/*
IAvatarFactoryModule afm = m_scenes[0].RequestModuleInterface<IAvatarFactoryModule>();
afm?.SetPreferencesHoverZ(agent, (float)data.HoverHeight);
*/
string response = OSDParser.SerializeLLSDXmlString(resp); string response = OSDParser.SerializeLLSDXmlString(resp);
return response; return response;
} }