diff options
| author | Melanie | 2009-11-28 09:26:00 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-28 09:26:00 +0000 |
| commit | d3e7a5293310651ea8adf28327e1cb9840bcf9d7 (patch) | |
| tree | 044fde70d244eecd8c1344eb973aa8d6e86e249b /OpenSim/Region/ScriptEngine/XEngine | |
| parent | Reset update flag when a SOG is deleted. This fixes llDie(); (diff) | |
| parent | Add some conditionals to references to the WorldComm module, so that the (diff) | |
| download | opensim-SC-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.zip opensim-SC-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.gz opensim-SC-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.bz2 opensim-SC-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 2fc2ea1..d997ea3 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1394,7 +1394,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1394 | if (rootE.GetAttribute("UUID") != itemID.ToString()) | 1394 | if (rootE.GetAttribute("UUID") != itemID.ToString()) |
| 1395 | return; | 1395 | return; |
| 1396 | 1396 | ||
| 1397 | string assetID = rootE.GetAttribute("Asset"); | 1397 | // string assetID = rootE.GetAttribute("Asset"); |
| 1398 | 1398 | ||
| 1399 | XmlNodeList stateL = rootE.GetElementsByTagName("ScriptState"); | 1399 | XmlNodeList stateL = rootE.GetElementsByTagName("ScriptState"); |
| 1400 | 1400 | ||