diff options
| author | Melanie Thielker | 2015-08-19 23:34:13 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2015-08-19 23:34:13 +0200 |
| commit | 35cbe76f279663725507c4703e52fb3f32349fea (patch) | |
| tree | 8d0159b426cfa5c02df07f76c002dbbb7b5deeee /OpenSim | |
| parent | Fix a possible nullref caused by accessing m_data rather than Data (diff) | |
| parent | Add explicit initialization because mono 3 doesn't like what mono 2 allows (diff) | |
| download | opensim-SC_OLD-35cbe76f279663725507c4703e52fb3f32349fea.zip opensim-SC_OLD-35cbe76f279663725507c4703e52fb3f32349fea.tar.gz opensim-SC_OLD-35cbe76f279663725507c4703e52fb3f32349fea.tar.bz2 opensim-SC_OLD-35cbe76f279663725507c4703e52fb3f32349fea.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 3fb3c32..7719f07 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -8002,7 +8002,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8002 | 8002 | ||
| 8003 | protected void SetEntityParams(List<ISceneEntity> entities, LSL_List rules, string originFunc) | 8003 | protected void SetEntityParams(List<ISceneEntity> entities, LSL_List rules, string originFunc) |
| 8004 | { | 8004 | { |
| 8005 | LSL_List remaining; | 8005 | LSL_List remaining = new LSL_List(); |
| 8006 | uint rulesParsed = 0; | 8006 | uint rulesParsed = 0; |
| 8007 | 8007 | ||
| 8008 | foreach (ISceneEntity entity in entities) | 8008 | foreach (ISceneEntity entity in entities) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index b3f298a..e799714 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2473,7 +2473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2473 | // on the ILSL_Api interface. | 2473 | // on the ILSL_Api interface. |
| 2474 | LSL_Api LSL_Api = (LSL_Api)m_LSL_Api; | 2474 | LSL_Api LSL_Api = (LSL_Api)m_LSL_Api; |
| 2475 | LSL_List retVal = new LSL_List(); | 2475 | LSL_List retVal = new LSL_List(); |
| 2476 | LSL_List remaining; | 2476 | LSL_List remaining = new LSL_List(); |
| 2477 | List<SceneObjectPart> parts = LSL_Api.GetLinkParts(linknumber); | 2477 | List<SceneObjectPart> parts = LSL_Api.GetLinkParts(linknumber); |
| 2478 | foreach (SceneObjectPart part in parts) | 2478 | foreach (SceneObjectPart part in parts) |
| 2479 | { | 2479 | { |