diff options
author | Jeff Ames | 2008-11-05 15:15:41 +0000 |
---|---|---|
committer | Jeff Ames | 2008-11-05 15:15:41 +0000 |
commit | 638fe7a7b5530320c63f83d50e80e2a17a308783 (patch) | |
tree | fd0f8bcc716994cda1d65ad8190b2dd114715361 | |
parent | * Apply http://opensimulator.org/mantis/view.php?id=2561 (diff) | |
download | opensim-SC-638fe7a7b5530320c63f83d50e80e2a17a308783.zip opensim-SC-638fe7a7b5530320c63f83d50e80e2a17a308783.tar.gz opensim-SC-638fe7a7b5530320c63f83d50e80e2a17a308783.tar.bz2 opensim-SC-638fe7a7b5530320c63f83d50e80e2a17a308783.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/Resources/005_UserStore.sql | 10 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 34 |
2 files changed, 19 insertions, 25 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/005_UserStore.sql b/OpenSim/Data/MSSQL/Resources/005_UserStore.sql index 80eb94f..1b6ab8f 100644 --- a/OpenSim/Data/MSSQL/Resources/005_UserStore.sql +++ b/OpenSim/Data/MSSQL/Resources/005_UserStore.sql | |||
@@ -1,5 +1,5 @@ | |||
1 | BEGIN TRANSACTION | 1 | BEGIN TRANSACTION |
2 | 2 | ||
3 | ALTER TABLE users add email varchar(250); | 3 | ALTER TABLE users add email varchar(250); |
4 | 4 | ||
5 | COMMIT | 5 | COMMIT |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index ead88d5..8a967ac 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -945,25 +945,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
945 | } | 945 | } |
946 | 946 | ||
947 | // send a message to to object identified by the given UUID, a script in the object must implement the dataserver function | 947 | // send a message to to object identified by the given UUID, a script in the object must implement the dataserver function |
948 | // the dataserver function is passed the ID of the calling function and a string message | 948 | // the dataserver function is passed the ID of the calling function and a string message |
949 | public void osMessageObject(LSL_Key objectUUID,string message) | 949 | public void osMessageObject(LSL_Key objectUUID, string message) |
950 | { | 950 | { |
951 | CheckThreatLevel(ThreatLevel.Low,"osMessageObject"); | 951 | CheckThreatLevel(ThreatLevel.Low, "osMessageObject"); |
952 | m_host.AddScriptLPS(1); | 952 | m_host.AddScriptLPS(1); |
953 | 953 | ||
954 | 954 | object[] resobj = new object[] { new LSL_Types.LSLString(m_host.UUID.ToString()), new LSL_Types.LSLString(message) }; | |
955 | object[] resobj = new object[] { new LSL_Types.LSLString(m_host.UUID.ToString()),new LSL_Types.LSLString(message) }; | 955 | |
956 | 956 | SceneObjectPart sceneOP = World.GetSceneObjectPart(new UUID(objectUUID)); | |
957 | SceneObjectPart sceneOP = World.GetSceneObjectPart(new UUID(objectUUID)); | 957 | |
958 | 958 | m_ScriptEngine.PostObjectEvent( | |
959 | m_ScriptEngine.PostObjectEvent( | 959 | sceneOP.LocalId, new EventParams( |
960 | sceneOP.LocalId, new EventParams( | 960 | "dataserver", resobj, new DetectParams[0])); |
961 | "dataserver", resobj, | 961 | } |
962 | new DetectParams[0])); | ||
963 | |||
964 | } | ||
965 | |||
966 | } | 962 | } |
967 | |||
968 | |||
969 | } | 963 | } |