aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-12-14 02:23:12 +0000
committerJustin Clark-Casey (justincc)2013-12-14 02:23:12 +0000
commitee163b5751f367866bc7370faf265fd30be3729e (patch)
tree8b8ac21bed7696b69a63623c686a8c5f440269b4
parentMerge branch 'justincc-master' (diff)
parentWrap analysis of the particle system in the UUID Gatherer in a separate try/c... (diff)
downloadopensim-SC_OLD-ee163b5751f367866bc7370faf265fd30be3729e.zip
opensim-SC_OLD-ee163b5751f367866bc7370faf265fd30be3729e.tar.gz
opensim-SC_OLD-ee163b5751f367866bc7370faf265fd30be3729e.tar.bz2
opensim-SC_OLD-ee163b5751f367866bc7370faf265fd30be3729e.tar.xz
Merge branch 'justincc-master'
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs15
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs20
4 files changed, 24 insertions, 23 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 4ab6908..566772d 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -135,8 +135,8 @@ namespace OpenSim.Framework.Servers
135 135
136 TimeSpan timeTaken = DateTime.Now - m_startuptime; 136 TimeSpan timeTaken = DateTime.Now - m_startuptime;
137 137
138 m_log.InfoFormat( 138 MainConsole.Instance.OutputFormat(
139 "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.", 139 "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.",
140 timeTaken.Minutes, timeTaken.Seconds); 140 timeTaken.Minutes, timeTaken.Seconds);
141 } 141 }
142 142
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 502c748..3e074b9 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -181,9 +181,18 @@ namespace OpenSim.Region.Framework.Scenes
181 181
182 if (part.ParticleSystem.Length > 0) 182 if (part.ParticleSystem.Length > 0)
183 { 183 {
184 Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0); 184 try
185 if (ps.Texture != UUID.Zero) 185 {
186 assetUuids[ps.Texture] = AssetType.Texture; 186 Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
187 if (ps.Texture != UUID.Zero)
188 assetUuids[ps.Texture] = AssetType.Texture;
189 }
190 catch (Exception e)
191 {
192 m_log.WarnFormat(
193 "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt. Continuing.",
194 part.Name, part.UUID, sceneObject.Name, sceneObject.UUID);
195 }
187 } 196 }
188 197
189 TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 198 TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index c717128..eb386fe 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -216,9 +216,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
216 // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}", 216 // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}",
217 // m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString()); 217 // m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString());
218 218
219 // Warn level because the region cannot be used while logins are disabled 219 // Putting this out to console to make it eye-catching for people who are running OpenSimulator
220 m_log.WarnFormat( 220 // without info log messages enabled. Making this a warning is arguably misleading since it isn't a
221 "[RegionReady]: INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name); 221 // warning, and monitor scripts looking for warn/error/fatal messages will received false positives.
222 // Arguably, log4net needs a status log level (like Apache).
223 MainConsole.Instance.OutputFormat("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name);
222 } 224 }
223 225
224 m_scene.SceneGridService.InformNeighborsThatRegionisUp( 226 m_scene.SceneGridService.InformNeighborsThatRegionisUp(
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 5804aa8..b261b9f 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1709,9 +1709,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1709 public bool GetScriptState(UUID itemID) 1709 public bool GetScriptState(UUID itemID)
1710 { 1710 {
1711 IScriptInstance instance = GetInstance(itemID); 1711 IScriptInstance instance = GetInstance(itemID);
1712 if (instance != null) 1712 return instance != null && instance.Running;
1713 return instance.Running;
1714 return false;
1715 } 1713 }
1716 1714
1717 public void ApiResetScript(UUID itemID) 1715 public void ApiResetScript(UUID itemID)
@@ -1755,9 +1753,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1755 public DetectParams GetDetectParams(UUID itemID, int idx) 1753 public DetectParams GetDetectParams(UUID itemID, int idx)
1756 { 1754 {
1757 IScriptInstance instance = GetInstance(itemID); 1755 IScriptInstance instance = GetInstance(itemID);
1758 if (instance != null) 1756 return instance != null ? instance.GetDetectParams(idx) : null;
1759 return instance.GetDetectParams(idx);
1760 return null;
1761 } 1757 }
1762 1758
1763 public void SetMinEventDelay(UUID itemID, double delay) 1759 public void SetMinEventDelay(UUID itemID, double delay)
@@ -1770,9 +1766,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1770 public UUID GetDetectID(UUID itemID, int idx) 1766 public UUID GetDetectID(UUID itemID, int idx)
1771 { 1767 {
1772 IScriptInstance instance = GetInstance(itemID); 1768 IScriptInstance instance = GetInstance(itemID);
1773 if (instance != null) 1769 return instance != null ? instance.GetDetectID(idx) : UUID.Zero;
1774 return instance.GetDetectID(idx);
1775 return UUID.Zero;
1776 } 1770 }
1777 1771
1778 public void SetState(UUID itemID, string newState) 1772 public void SetState(UUID itemID, string newState)
@@ -1786,9 +1780,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1786 public int GetStartParameter(UUID itemID) 1780 public int GetStartParameter(UUID itemID)
1787 { 1781 {
1788 IScriptInstance instance = GetInstance(itemID); 1782 IScriptInstance instance = GetInstance(itemID);
1789 if (instance == null) 1783 return instance == null ? 0 : instance.StartParam;
1790 return 0;
1791 return instance.StartParam;
1792 } 1784 }
1793 1785
1794 public void OnShutdown() 1786 public void OnShutdown()
@@ -1822,9 +1814,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1822 public IScriptApi GetApi(UUID itemID, string name) 1814 public IScriptApi GetApi(UUID itemID, string name)
1823 { 1815 {
1824 IScriptInstance instance = GetInstance(itemID); 1816 IScriptInstance instance = GetInstance(itemID);
1825 if (instance == null) 1817 return instance == null ? null : instance.GetApi(name);
1826 return null;
1827 return instance.GetApi(name);
1828 } 1818 }
1829 1819
1830 public void OnGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) 1820 public void OnGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)