diff --git a/OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs b/OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs
index 78f1a15aa0..75483f1a15 100644
--- a/OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs
@@ -32,6 +32,7 @@ namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IEnvironmentModule
     {
+        void StoreOnRegion(ViewerEnvironment VEnv);
         void ResetEnvironmentSettings(UUID regionUUID);
         void FromLightShare(RegionLightShareData wl);
         RegionLightShareData ToLightShare();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4b2bb3ff0a..ce9b7cc5a6 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1709,6 +1709,8 @@ namespace OpenSim.Region.Framework.Scenes
             else
                 Animator.ResetAnimations();
 
+            Environment = null;
+
 
 //            m_log.DebugFormat(
 //                 "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",