aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorMelanie2010-08-05 08:20:32 +0100
committerMelanie2010-08-05 08:20:32 +0100
commit9e9296848de521420724daa6035f793e5f9f1af8 (patch)
tree74ff9d57f9b809e39970030afa5afd934174bdab /OpenSim/Region/ScriptEngine/Shared/Api
parentPrevent setting the hovertext from firing changed_color (diff)
parentMerge branch 'iar-merge' (diff)
downloadopensim-SC_OLD-9e9296848de521420724daa6035f793e5f9f1af8.zip
opensim-SC_OLD-9e9296848de521420724daa6035f793e5f9f1af8.tar.gz
opensim-SC_OLD-9e9296848de521420724daa6035f793e5f9f1af8.tar.bz2
opensim-SC_OLD-9e9296848de521420724daa6035f793e5f9f1af8.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index fe71ed5..5ae6439 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *