diff options
author | UbitUmarov | 2018-03-09 22:44:58 +0000 |
---|---|---|
committer | UbitUmarov | 2018-03-09 22:44:58 +0000 |
commit | 2369ce413d7d6e2b5b368ef11239263eec5eac74 (patch) | |
tree | a47b9faf126b4cd4bca962a1aa43e062b3d64272 /OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs | |
parent | remove a unnecessay file check (diff) | |
download | opensim-SC-2369ce413d7d6e2b5b368ef11239263eec5eac74.zip opensim-SC-2369ce413d7d6e2b5b368ef11239263eec5eac74.tar.gz opensim-SC-2369ce413d7d6e2b5b368ef11239263eec5eac74.tar.bz2 opensim-SC-2369ce413d7d6e2b5b368ef11239263eec5eac74.tar.xz |
Yengine: only retry compile if there was a object file in cache with wrong version or signature
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs index ba72e39..bbdec99 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs | |||
@@ -90,12 +90,12 @@ namespace OpenSim.Region.ScriptEngine.Yengine | |||
90 | // Check version number to make sure we know how to process file contents. | 90 | // Check version number to make sure we know how to process file contents. |
91 | char[] ocm = objFileReader.ReadChars(ScriptCodeGen.OBJECT_CODE_MAGIC.Length); | 91 | char[] ocm = objFileReader.ReadChars(ScriptCodeGen.OBJECT_CODE_MAGIC.Length); |
92 | if(new String(ocm) != ScriptCodeGen.OBJECT_CODE_MAGIC) | 92 | if(new String(ocm) != ScriptCodeGen.OBJECT_CODE_MAGIC) |
93 | throw new Exception("not an Yengine object file (bad magic)"); | 93 | throw new CVVMismatchException("Not an Yengine object file (bad magic)"); |
94 | 94 | ||
95 | int cvv = objFileReader.ReadInt32(); | 95 | int cvv = objFileReader.ReadInt32(); |
96 | if(cvv != ScriptCodeGen.COMPILED_VERSION_VALUE) | 96 | if(cvv != ScriptCodeGen.COMPILED_VERSION_VALUE) |
97 | throw new CVVMismatchException(cvv, ScriptCodeGen.COMPILED_VERSION_VALUE); | 97 | throw new CVVMismatchException( |
98 | 98 | "Object version is " + cvv.ToString() + " but accept only " + ScriptCodeGen.COMPILED_VERSION_VALUE.ToString()); | |
99 | // Fill in simple parts of scriptObjCode object. | 99 | // Fill in simple parts of scriptObjCode object. |
100 | sourceHash = objFileReader.ReadString(); | 100 | sourceHash = objFileReader.ReadString(); |
101 | glblSizes.ReadFromFile(objFileReader); | 101 | glblSizes.ReadFromFile(objFileReader); |