ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 22:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-11-21 23:47:28 +00:00
parent 5f8a0f3d1f c85e6bc36d
commit 8d7b181b58
14 changed files with 328 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -9283,7 +9283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
switch (data)
{
case 5: // DATA_SIM_POS
case ScriptBaseClass.DATA_SIM_POS:
if (info == null)
{
ScriptSleep(1000);
@@ -9294,13 +9294,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
info.RegionLocY,
0).ToString();
break;
case 6: // DATA_SIM_STATUS
case ScriptBaseClass.DATA_SIM_STATUS:
if (info != null)
reply = "up"; // Duh!
else
reply = "unknown";
break;
case 7: // DATA_SIM_RATING
case ScriptBaseClass.DATA_SIM_RATING:
if (info == null)
{
ScriptSleep(1000);
@@ -9316,7 +9316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
else
reply = "UNKNOWN";
break;
case 128:
case ScriptBaseClass.DATA_SIM_RELEASE:
if (ossl != null)
ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData");
reply = "OpenSim";