aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-02 16:27:16 +0000
committerMelanie Thielker2009-04-02 16:27:16 +0000
commitf17732346e00ba73ce1c8508849b3fe5c72b9298 (patch)
tree4c3c551b420e0f65a3b97e68a0b5f4d1da706ed6 /OpenSim
parentCorrect llSetPrimitiveParams to check for a texture in inventory when setting... (diff)
downloadopensim-SC_OLD-f17732346e00ba73ce1c8508849b3fe5c72b9298.zip
opensim-SC_OLD-f17732346e00ba73ce1c8508849b3fe5c72b9298.tar.gz
opensim-SC_OLD-f17732346e00ba73ce1c8508849b3fe5c72b9298.tar.bz2
opensim-SC_OLD-f17732346e00ba73ce1c8508849b3fe5c72b9298.tar.xz
Fix a nullref when compiling non-LSL scripts
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 6964490..162f323 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -644,12 +644,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
644 sfs.Close(); 644 sfs.Close();
645 645
646 string posmap = String.Empty; 646 string posmap = String.Empty;
647 foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> kvp in m_positionMap) 647 if (m_positionMap != null)
648 { 648 {
649 KeyValuePair<int, int> k = kvp.Key; 649 foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> kvp in m_positionMap)
650 KeyValuePair<int, int> v = kvp.Value; 650 {
651 posmap += String.Format("{0},{1},{2},{3}\n", 651 KeyValuePair<int, int> k = kvp.Key;
652 k.Key, k.Value, v.Key, v.Value); 652 KeyValuePair<int, int> v = kvp.Value;
653 posmap += String.Format("{0},{1},{2},{3}\n",
654 k.Key, k.Value, v.Key, v.Value);
655 }
653 } 656 }
654 657
655 buf = enc.GetBytes(posmap); 658 buf = enc.GetBytes(posmap);