aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-29 05:56:37 -0700
committerJohn Hurliman2009-10-29 05:56:37 -0700
commitdd13fa361b12fa2fb1c91c9f74379a305935a87d (patch)
treeff4c2e2d4eef64d20d09a3ccfb002b5d23396209 /OpenSim/Region/ScriptEngine/Shared/Instance
parentOptimizations (diff)
downloadopensim-SC_OLD-dd13fa361b12fa2fb1c91c9f74379a305935a87d.zip
opensim-SC_OLD-dd13fa361b12fa2fb1c91c9f74379a305935a87d.tar.gz
opensim-SC_OLD-dd13fa361b12fa2fb1c91c9f74379a305935a87d.tar.bz2
opensim-SC_OLD-dd13fa361b12fa2fb1c91c9f74379a305935a87d.tar.xz
* Misc. formatting cleanup for the previous patch
* Added the new AppDomainLoading variable to the [XEngine] section in the example config
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 37ec5df..f16aefc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
93 private StateSource m_stateSource; 93 private StateSource m_stateSource;
94 private bool m_postOnRez; 94 private bool m_postOnRez;
95 private bool m_startedFromSavedState = false; 95 private bool m_startedFromSavedState = false;
96 private int m_CurrentStateHash; 96 private UUID m_CurrentStateHash;
97 private UUID m_RegionID = UUID.Zero; 97 private UUID m_RegionID = UUID.Zero;
98 98
99 private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> 99 private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
@@ -901,7 +901,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
901 901
902 // Compare hash of the state we just just created with the state last written to disk 902 // Compare hash of the state we just just created with the state last written to disk
903 // If the state is different, update the disk file. 903 // If the state is different, update the disk file.
904 if(xml.GetHashCode() != m_CurrentStateHash) 904 UUID hash = UUID.Parse(Utils.MD5String(xml));
905
906 if(hash != m_CurrentStateHash)
905 { 907 {
906 try 908 try
907 { 909 {
@@ -919,7 +921,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
919 //{ 921 //{
920 // throw new Exception("Completed persistence save, but no file was created"); 922 // throw new Exception("Completed persistence save, but no file was created");
921 //} 923 //}
922 m_CurrentStateHash = xml.GetHashCode(); 924 m_CurrentStateHash = hash;
923 } 925 }
924 } 926 }
925 927