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

some changes on viewer caps detection

master
UbitUmarov 2020-06-09 18:43:26 +01:00
parent fa0044fb6c
commit bde4354c15
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Capabilities/Caps.cs
View File

@ -126,8 +126,9 @@ namespace OpenSim.Framework.Capabilities
None = 0, None = 0,
SentSeeds = 1, SentSeeds = 1,
ObjectAnim = 0x10, ObjectAnim = 0x100,
AdvEnv = 0x20 WLEnv = 0x200,
AdvEnv = 0x400
} }
public CapsFlags Flags { get; set;} public CapsFlags Flags { get; set;}
@ -294,9 +295,6 @@ namespace OpenSim.Framework.Capabilities
port = MainServer.Instance.SSLPort; port = MainServer.Instance.SSLPort;
protocol = "https"; protocol = "https";
} }
//
// caps.RegisterHandler("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
caps[kvp.Key] = string.Format("{0}://{1}:{2}{3}", protocol, hostName, port, kvp.Value.Url); caps[kvp.Key] = string.Format("{0}://{1}:{2}{3}", protocol, hostName, port, kvp.Value.Url);
} }
} }
@ -310,7 +308,7 @@ namespace OpenSim.Framework.Capabilities
caps[kvp.Key] = kvp.Value; caps[kvp.Key] = kvp.Value;
} }
Flags |= CapsFlags.SentSeeds;
return caps; return caps;
} }

2
OpenSim/Framework/EstateSettings.cs
View File

@ -237,7 +237,7 @@ namespace OpenSim.Framework
set { m_DenyMinors = value; } set { m_DenyMinors = value; }
} }
public bool AllowEnviromentOverride {get; set;} = true; public bool AllowEnviromentOverride {get; set;} = false;
// All those lists... // All those lists...
// //

4
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -405,6 +405,8 @@ namespace OpenSim.Region.ClientStack.Linden
string cstr = c.AsString(); string cstr = c.AsString();
if (cstr.Equals("ObjectAnimation")) if (cstr.Equals("ObjectAnimation"))
m_HostCapsObj.Flags |= Caps.CapsFlags.ObjectAnim; m_HostCapsObj.Flags |= Caps.CapsFlags.ObjectAnim;
else if (cstr.Equals("EnvironmentSettings"))
m_HostCapsObj.Flags |= Caps.CapsFlags.WLEnv;
else if (cstr.Equals("ExtEnvironment")) else if (cstr.Equals("ExtEnvironment"))
m_HostCapsObj.Flags |= Caps.CapsFlags.AdvEnv; m_HostCapsObj.Flags |= Caps.CapsFlags.AdvEnv;
validCaps.Add(cstr); validCaps.Add(cstr);
@ -414,6 +416,8 @@ namespace OpenSim.Region.ClientStack.Linden
httpResponse.RawBuffer = Util.UTF8NBGetbytes(result); httpResponse.RawBuffer = Util.UTF8NBGetbytes(result);
httpResponse.StatusCode = (int)HttpStatusCode.OK; httpResponse.StatusCode = (int)HttpStatusCode.OK;
//m_log.DebugFormat("[CAPS] CapsRequest {0}", result); //m_log.DebugFormat("[CAPS] CapsRequest {0}", result);
m_HostCapsObj.Flags |= Caps.CapsFlags.SentSeeds;
} }
/// <summary> /// <summary>

4
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -13820,6 +13820,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_SupportObjectAnimations = true; m_SupportObjectAnimations = true;
ret |= 0x2000; ret |= 0x2000;
} }
if ((cap.Flags & Caps.CapsFlags.WLEnv) != 0)
ret |= 0x4000;
if ((cap.Flags & Caps.CapsFlags.AdvEnv) != 0)
ret |= 0x8000;
} }
} }