From ea3e0ef8a362a103fd70f17cfc3ea76a20fac5ab Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 28 Feb 2013 14:20:07 -0800
Subject: Bug fix in DataSnapshot, where a var was being used before being
 initialized.

---
 OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 34 ++++++++++------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 32017a8..dd48dd5 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -148,8 +148,6 @@ namespace OpenSim.Region.DataSnapshot
                         return;
                     }
 
-                    if (m_enabled)
-                        m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname);
                 }
 
             }
@@ -163,8 +161,22 @@ namespace OpenSim.Region.DataSnapshot
 
             m_log.DebugFormat("[DATASNAPSHOT]: Module added to Scene {0}.", scene.RegionInfo.RegionName);
 
-            m_snapStore.AddScene(scene);
+            if (!m_servicesNotified)
+            {
+                m_hostname = scene.RegionInfo.ExternalHostName;
+                m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname);
+
+                //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer
+                new DataRequestHandler(scene, this);
+
+                if (m_dataServices != "" && m_dataServices != "noservices")
+                    NotifyDataServices(m_dataServices, "online");
+
+                m_servicesNotified = true;
+            }
+
             m_scenes.Add(scene);
+            m_snapStore.AddScene(scene);
 
             Assembly currentasm = Assembly.GetExecutingAssembly();
 
@@ -189,22 +201,6 @@ namespace OpenSim.Region.DataSnapshot
                 }
             }
 
-            // Must be done here because on shared modules, PostInitialise() will run
-            // BEFORE any scenes are registered. There is no "all scenes have been loaded"
-            // kind of callback because scenes may be created dynamically, so we cannot
-            // have that info, ever.
-            if (!m_servicesNotified)
-            {
-                //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer
-                new DataRequestHandler(m_scenes[0], this);
-
-                m_hostname = m_scenes[0].RegionInfo.ExternalHostName;
-
-                if (m_dataServices != "" && m_dataServices != "noservices")
-                    NotifyDataServices(m_dataServices, "online");
-
-                m_servicesNotified = true;
-            }
         }
 
         public void RemoveRegion(Scene scene)
-- 
cgit v1.1


From b2087add9633a0b3b1ddeaee1a40c1e16bd95314 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 28 Feb 2013 15:17:07 -0800
Subject: Add missing prebuild.xml dependency for System.Action2<t1,t2> in
 recent additions to ScriptEngine tests. Compiles some places but not others.

---
 prebuild.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prebuild.xml b/prebuild.xml
index 0e58792..2b8e963 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3387,6 +3387,7 @@
 
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
+      <Reference name="System.Core"/>
       <Reference name="System.Xml"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Communications"/>
-- 
cgit v1.1