Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
author: Melanie 2013-03-14 22:34:15 +0000
committer: Melanie 2013-03-14 22:34:15 +0000
commit: 8b657773e4305dc853802017b3353d8d85872e14 (patch)
tree: 9810e0c221baf927110b34a2d0545182e25595fd /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins
parent: Merge branch 'avination' into careminster (diff)
parent: refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation() (diff)
download: opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.zip
opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.gz
opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.bz2
opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index d3ef378..884f07c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -700,4 +700,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
            return retList;
        }           
    }
-}
-\ No newline at end of file
+}
author	Melanie	2013-03-14 22:34:15 +0000
committer	Melanie	2013-03-14 22:34:15 +0000
commit	8b657773e4305dc853802017b3353d8d85872e14 (patch)
tree	9810e0c221baf927110b34a2d0545182e25595fd /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins
parent	Merge branch 'avination' into careminster (diff)
parent	refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation() (diff)
download	opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.zip opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.gz opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.bz2 opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index d3ef378..884f07c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -700,4 +700,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
700	return retList;	700	return retList;
701	}	701	}
702	}	702	}
703	} \ No newline at end of file	703	}