ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow the use of Sky or water from a asset, not just full daycycle. This may need more work

Browse Source
This commit is contained in:
UbitUmarov
2020-07-15 22:56:09 +01:00
parent f7104a66a5
commit 1f822c6077
3 changed files with 107 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
View File

@@ -594,16 +594,16 @@ namespace OpenSim.Region.CoreModules.World.LightShare
try
{
OSD req = OSDParser.Deserialize(httpRequest.InputStream);
if(req is OpenMetaverse.StructuredData.OSDMap)
if(req is OSDMap)
{
OSDMap map = req as OpenMetaverse.StructuredData.OSDMap;
OSDMap map = req as OSDMap;
if(map.TryGetValue("environment", out OSD env))
{
if (VEnv == null)
// need a proper clone
VEnv = m_DefaultEnv.Clone();
OSDMap evmap = (OSDMap)env;
OSDMap evmap = env as OSDMap;
if(evmap.TryGetValue("day_asset", out OSD tmp) && !evmap.ContainsKey("day_cycle"))
{
string id = tmp.AsString();
@@ -616,7 +616,11 @@ namespace OpenSim.Region.CoreModules.World.LightShare
try
{
OSD oenv = OSDParser.Deserialize(asset.Data);
VEnv.CycleFromOSD(oenv);
evmap.TryGetValue("day_name", out tmp);
if(tmp is OSDString)
VEnv.FromAssetOSD(tmp.AsString(), oenv);
else
VEnv.FromAssetOSD(null, oenv);
}
catch
{
@@ -624,7 +628,9 @@ namespace OpenSim.Region.CoreModules.World.LightShare
return;
}
}
VEnv.FromOSD(env);
else
VEnv.FromOSD(env);
if(lchannel == null)
{
StoreOnRegion(VEnv);