From 9d63f90467dbc60622a49f564a56fdd20de90f51 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 26 Nov 2009 17:03:09 +0000
Subject: Remove the old (Remoting) region crossing code. Fix the new code to
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump because
it was broken anyway, so with a version mismatch it will simply stay broken,
but not crash. Region corssing still doesn't work because there is still
monkey business with both rezzed prims being pushed across a border and
attached prims when walking across a border. Teleport is untested by may
work.
---
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 5 -----
1 file changed, 5 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 41b5d49..5c5d57e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -1011,10 +1011,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
{
get { return m_RegionID; }
}
-
- public bool CanBeDeleted()
- {
- return true;
- }
}
}
--
cgit v1.1
From d39c300d11109553b75ca761d26dda278c0ad7dd Mon Sep 17 00:00:00 2001
From: Jeff Lee
Date: Sun, 22 Nov 2009 18:10:46 -0500
Subject: Added osGetRegionStats() function, to return a number of sim
statistics
---
.../Shared/Api/Implementation/LSL_Api.cs | 1 +
.../Shared/Api/Implementation/OSSL_Api.cs | 15 ++++++++++++++
.../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 +
.../Shared/Api/Runtime/LSL_Constants.cs | 23 ++++++++++++++++++++++
.../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 +++++
5 files changed, 45 insertions(+)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index fbbbfdc..5de23ad 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5784,6 +5784,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1);
return World.SimulatorFPS;
}
+
/* particle system rules should be coming into this routine as doubles, that is
rule[0] should be an integer from this list and rule[1] should be the arg
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e72fa70..482bfbc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1948,5 +1948,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return key.ToString();
}
+
+ public LSL_List osGetRegionStats()
+ {
+ CheckThreatLevel(ThreatLevel.High, "osGetRegionStats");
+ m_host.AddScriptLPS(1);
+ LSL_List ret = new LSL_List();
+ float[] stats = World.SimulatorStats;
+
+ for (int i = 0; i < 21; i++)
+ {
+ ret.Add(new LSL_Float( stats[i] ));
+ }
+ return ret;
+ }
+
}
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 470946a..0b0dc00 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -162,5 +162,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
key osGetMapTexture();
key osGetRegionMapTexture(string regionName);
+ LSL_List osGetRegionStats();
}
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 753ca55..acff8fb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -515,6 +515,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const string TEXTURE_PLYWOOD = "89556747-24cb-43ed-920b-47caed15465f";
public const string TEXTURE_TRANSPARENT = "8dcd4a48-2d37-4909-9f78-f7a9eb4ef903";
public const string TEXTURE_MEDIA = "8b5fec65-8d8d-9dc5-cda8-8fdf2716e361";
+
+ // Constants for osGetRegionStats
+ public const int STATS_TIME_DILATION = 0;
+ public const int STATS_SIM_FPS = 1;
+ public const int STATS_PHYSICS_FPS = 2;
+ public const int STATS_AGENT_UPDATES = 3;
+ public const int STATS_ROOT_AGENTS = 4;
+ public const int STATS_CHILD_AGENTS = 5;
+ public const int STATS_TOTAL_PRIMS = 6;
+ public const int STATS_ACTIVE_PRIMS = 7;
+ public const int STATS_FRAME_MS = 8;
+ public const int STATS_NET_MS = 9;
+ public const int STATS_PHYSICS_MS = 10;
+ public const int STATS_IMAGE_MS = 11;
+ public const int STATS_OTHER_MS = 12;
+ public const int STATS_IN_PACKETS_PER_SECOND = 13;
+ public const int STATS_OUT_PACKETS_PER_SECOND = 14;
+ public const int STATS_UNACKED_BYTES = 15;
+ public const int STATS_AGENT_MS = 16;
+ public const int STATS_PENDING_DOWNLOADS = 17;
+ public const int STATS_PENDING_UPLOADS = 18;
+ public const int STATS_ACTIVE_SCRIPTS = 19;
+ public const int STATS_SCRIPT_LPS = 20;
}
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 6b88834..519463e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -632,5 +632,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{
return m_OSSL_Functions.osGetRegionMapTexture(regionName);
}
+
+ public LSL_List osGetRegionStats()
+ {
+ return m_OSSL_Functions.osGetRegionStats();
+ }
}
}
--
cgit v1.1
From 9d05962029fe864408d287d5fa7ef81f312e098a Mon Sep 17 00:00:00 2001
From: Jeff Lee
Date: Mon, 23 Nov 2009 11:53:37 -0500
Subject: Added osGetRegionStats() function, to return a number of sim
statistics
---
.../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 482bfbc..5501679 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1949,9 +1949,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return key.ToString();
}
+ ///
+ /// Return information regarding various simulator statistics (sim fps, physics fps, time
+ /// dilation, total number of prims, total number of active scripts, script lps, various
+ /// timing data, packets in/out, etc. Basically much the information that's shown in the
+ /// client's Statistics Bar (Ctrl-Shift-1)
+ ///
+ /// List of floats
public LSL_List osGetRegionStats()
{
- CheckThreatLevel(ThreatLevel.High, "osGetRegionStats");
+ CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
m_host.AddScriptLPS(1);
LSL_List ret = new LSL_List();
float[] stats = World.SimulatorStats;
--
cgit v1.1