Commit Graph

3344 Commits

Author SHA1 Message Date
UbitUmarov
feb78b2910 add several options for NPC creation so abusive use can be reduced (restrictive by default) UNTESTED 2015-09-30 02:45:11 +01:00
UbitUmarov
1124d14eb0 remove some restrictions on NPCs creation 2015-09-29 22:15:56 +01:00
UbitUmarov
3e9b326fcc clean some spacing issues 2015-09-29 21:44:25 +01:00
UbitUmarov
fb69661bb9 ... ossl merge issue 2015-09-28 16:40:55 +01:00
UbitUmarov
fd20a9576d ... post merge issue 2015-09-28 16:03:10 +01:00
UbitUmarov
5ca610d56a bug fix, let ubODE see more than one mesh on cast ray 2015-09-24 06:32:40 +01:00
UbitUmarov
592ba85b0a add Culture.FormatProvider on all casts to LSLString on Vectors and Quaternions. This may need better checking 2015-09-23 17:04:48 +01:00
UbitUmarov
a6b8cc9887 replace LSL reference to sog GetLinkedAvatars 2015-09-21 21:38:50 +01:00
Kevin Cozens
b412db72be Fix a regression to GetSittingAvatars(). Return List<ScenePresence> once more. 2015-09-21 11:00:34 -04:00
UbitUmarov
ece4088a45 add missing llSetVelocity stub 2015-09-08 21:53:52 +01:00
UbitUmarov
5b3e2ab9aa Merge branch 'mbworknew1' into ubitworkvarnew 2015-09-08 15:03:22 +01:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
UbitUmarov
c4c6fcf7ad fix missing proprieties get, etc 2015-09-08 12:43:54 +01:00
UbitUmarov
af440162f7 minor change, add a lock we had at avn 2015-09-06 20:22:44 +01:00
UbitUmarov
93b9a92990 add missing stub for llSetVelocity 2015-09-06 04:55:58 +01:00
UbitUmarov
5aa7a4fa52 fix CM_api compile error 2015-09-03 20:22:39 +01:00
UbitUmarov
db6c4a89a8 minor clean 2015-09-03 20:05:17 +01:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Diva Canto
ce2c67876e More namespace and dll name changes. Still no functional changes. 2015-08-30 21:05:36 -07:00
Diva Canto
2c0cad6dd3 Renamed the namespaces too 2015-08-30 20:29:31 -07:00
lillith xue
722d00903b Add Culture.FormatProvider to String.Format, like it is done for LSLFloat
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-24 01:21:33 +02:00
Melanie Thielker
87247dc2c9 Just replace all m_data accesses with accesses to Data, which is
protected against nullrefs
2015-08-24 00:08:08 +02:00
UbitUmarov
ca53671691 add missing culture format on lslvector toString 2015-08-23 17:31:15 +01:00
Melanie Thielker
a9beee7050 Revert "Revert "Fix a possible nullref caused by accessing m_data rather than Data""
Needed after all

This reverts commit 26094c21fe.
2015-08-23 17:48:48 +02:00
Melanie Thielker
c4ea4ea000 Fix the nullref in scripts - the right way 2015-08-23 17:36:08 +02:00
Melanie Thielker
26094c21fe Revert "Fix a possible nullref caused by accessing m_data rather than Data"
My bad!

This reverts commit 20326e1947.
2015-08-23 17:34:20 +02:00
Melanie Thielker
35cbe76f27 Merge branch 'master' of opensimulator.org:/var/git/opensim 2015-08-19 23:34:13 +02:00
Melanie Thielker
20326e1947 Fix a possible nullref caused by accessing m_data rather than Data 2015-08-19 23:33:38 +02:00
Melanie
7633ebf36f Add explicit initialization because mono 3 doesn't like what mono 2 allows 2015-08-19 23:18:40 +02:00
Melanie Thielker
662b59af83 Convert the lsl list type into a struct. EXPERIMENTAL! This may affect
the llSetPrimitiveParams family of functions adversely. Please test!
2015-08-19 23:14:11 +02:00
UbitUmarov
0b105da626 Merge branch 'mbworkvar2' into ubitvar 2015-08-19 08:48:50 +01:00
Melanie Thielker
25335b0707 Some unit tests are simply broken and create an API with a null m_item.
This isn't supposed to be done and should be changed in the tests.
For now, add a protective check.
2015-08-19 01:19:25 +02:00
Melanie Thielker
c61aee12d4 Fix adding a scalar to the end of a list 2015-08-19 01:04:10 +02:00
Melanie Thielker
62f3399559 Try to address Mantis #7689. When adding a scalar to a list, make a copy
as is done when adding another list.
2015-08-19 01:00:42 +02:00
Melanie Thielker
c53f732163 Change the IScriptApi back to it's original form, removing XEngine
specific additions that should not have been there in the first place.
Sleeping and time measurement are now completely internal to XEngine
2015-08-17 21:46:30 +02:00
Melanie Thielker
ee7debcca6 Revert "When scripts are sleeping, don't count that as execution time"
The approach is good but the way it is written breaks the architecture.
Rewrite follows.

This reverts commit a568f06b7f.
2015-08-17 18:11:45 +02:00
Melanie Thielker
664ecb1938 Prevent the spammy "many event" message from appearing in normal use.
Console command debug xengine now turns that on.
Also, per orenh, remove the triggers at 1000 and 10000 as they are not
useful now that top scripts works.
2015-08-17 18:05:39 +02:00
Melanie Thielker
e9067c133c Remove DOS line endings from LSL_API.cs 2015-08-13 01:34:18 +02:00
Diva Canto
a22e6cb7f5 Whitespace borkness? 2015-08-12 09:13:45 -07:00
Drake Arconis
f25c67ea1d Send correct uuids in the FromID and ID packet fields for llInstantMessage
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-08-12 09:08:01 -07:00
Oren Hurvitz
59da146e9d When the user stops a script, have it remain stopped
Previously the script state was never saved for a !Running script, so upon region restart the script would be Running again.

The use of the 'StayStopped' flag is needed because all scripts are automatically stopped when the region shuts down, but in that case we shouldn't save in their state that they're !Running.
2015-08-11 08:44:27 +01:00
Oren Hurvitz
a568f06b7f When scripts are sleeping, don't count that as execution time
Sleeping doesn't use the CPU.
2015-08-11 08:44:27 +01:00
Oren Hurvitz
d24528b3bc Show Script Time in the statistics panel
The value shown is the number of milliseconds per frame that were spent executing scripts in this region.
2015-08-11 08:44:26 +01:00
Oren Hurvitz
5679cd0100 Changed "Script Execution Time" to be the gross time, i.e. including handling it in XEngine
Previously the "Net Time" was reported: only the time actually spent in the script's code. This is not a correct indication of how much load the script places on the simulator, because scripts that change state often or have many events use up a lot of time just in the event handlers, and previously this time wasn't counted.
2015-08-11 08:42:31 +01:00
Oren Hurvitz
a3bed1fbcb Report "Script Execution Time" as the time spent executing the script in the last 30 seconds. Use a sliding window to calculate this.
Notes:
- This metric provides a better indication of which scripts are taking up a lot of CPU (and therefore should be optimized).
- Previously the execution time was reset to 0 in every new measurement period, causing the reported time to fluctuate for no reason. This has been fixed by using a sliding window.
2015-08-11 08:42:26 +01:00
Oren Hurvitz
287096d826 Improved calculation of Script Execution TimeStarted
1. Use a Stopwatch (a high-resolution timer)
2. Whenever we start a new measurement period, zero out the total execution time (previously it just kept accumulating)
3. Changed the measurement period from 30 minutes to 30 seconds. This is much more useful in the "Top Scripts" dialog, as it shows currently active scripts
2015-08-11 07:35:41 +01:00
Oren Hurvitz
20af31f18e Fixed mistakes related to confusion between Environment.TickCount (milliseconds) and TimeSpan.TicksPerXXX (10000 x milliseconds) 2015-08-11 07:35:40 +01:00
Oren Hurvitz
4c6fb9fb64 Log scripts that have processed many events: this is probably an indication of a problem 2015-08-11 07:35:39 +01:00
Oren Hurvitz
7457173fe4 Fixed calling "debug xengine log" without the 'level' parameter: this should show the current log level; not crash 2015-08-11 07:35:38 +01:00