diff --git a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
index eaecc40e8c..4ab4fd0fca 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
@@ -250,16 +250,21 @@ namespace OpenSim.Region.CoreModules.World.LightShare
             {
                 if(!client.IsActive)
                     return;
- 
-                m_eventQueue.WindlightRefreshEvent(interpolate, client.AgentId);
-                /*
+
+                uint vflags = client.GetViewerCaps();
+
+                if ((vflags & 0x8000) != 0)
+                    m_estateModule.HandleRegionInfoRequest(client);
+
+                else if ((vflags & 0x4000) != 0)
+                    m_eventQueue.WindlightRefreshEvent(interpolate, client.AgentId);
+
                 else
                 {
                     if(ls == null)
                         ls = MakeLightShareData();
                     SendLightShare(client, ls);
                 }
-                */
             });
         }