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

Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-11-02 20:00:06 -07:00
parent c830f85fed 4ab9d37a8e
commit 379fc60c06
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@ -817,6 +817,7 @@ namespace OpenSim.Data.MySQL
nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]); nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]); nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]); nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
nWP.valid = true;
} }
} }
} }

1
OpenSim/Framework/RegionInfo.cs
View File

@ -42,6 +42,7 @@ namespace OpenSim.Framework
{ {
public class RegionLightShareData : ICloneable public class RegionLightShareData : ICloneable
{ {
public bool valid = false;
public UUID regionID = UUID.Zero; public UUID regionID = UUID.Zero;
public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f); public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f);
public float waterFogDensityExponent = 4.0f; public float waterFogDensityExponent = 4.0f;

3
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
View File

@ -194,7 +194,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
} }
private void EventManager_OnSaveNewWindlightProfile() private void EventManager_OnSaveNewWindlightProfile()
{ {
m_scene.ForEachScenePresence(SendProfileToClient); if (m_scene.RegionInfo.WindlightSettings.valid)
m_scene.ForEachScenePresence(SendProfileToClient);
} }
public void PostInitialise() public void PostInitialise()

1
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
View File

@ -455,6 +455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (LightShareModule.EnableWindlight) if (LightShareModule.EnableWindlight)
{ {
RegionLightShareData wl = getWindlightProfileFromRules(rules); RegionLightShareData wl = getWindlightProfileFromRules(rules);
wl.valid = true;
m_host.ParentGroup.Scene.StoreWindlightProfile(wl); m_host.ParentGroup.Scene.StoreWindlightProfile(wl);
success = 1; success = 1;
} }