diff --git a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
index b93a5f086a..e4b48c4305 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
@@ -467,7 +467,17 @@ namespace OpenSim.Region.CoreModules.World.LightShare
             ScenePresence sp = m_scene.GetScenePresence(agentID);
 
             if(sp != null && sp.Environment != null)
-                VEnv = sp.Environment;
+            {
+                if (parcelid == -1)
+                    VEnv = sp.Environment;
+                else
+                {
+                    OSD def = ViewerEnvironment.DefaultToOSD(regionID, parcelid);
+                    httpResponse.RawBuffer = OSDParser.SerializeLLSDXmlToBytes(def);
+                    httpResponse.StatusCode = (int)HttpStatusCode.OK;
+                    return;
+                }
+            }
             else if (parcelid == -1)
                 VEnv = GetRegionEnvironment();
             else