ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,573 Commits 5 Branches 93 Tags
b16abc8166c29585cb76cc55c3bdd76e5833cb4f
Commit Graph

3477 Commits

Author SHA1 Message Date
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
Oren Hurvitz
2153a01cc7 Have osAvatarName2Key check the cache first, even for foreign users 
Another change: removed the second call to userManager.AddUser(). UserManagementModule won't modify an existing record.
 2015-08-07 11:34:52 +03:00
Christopher
86c426e587 create osGetAvatarHomeURI 
Signed-off-by: Melanie Thielker <melanie@t-data.com>
 2015-08-04 18:09:13 +02:00
Christopher
b5be5ca490 Make osAvatarName2Key() able to get names from unknown HG users 
Signed-off-by: Melanie Thielker <melanie@t-data.com>
 2015-08-04 18:08:54 +02:00
Christopher
bccf785665 osKey2Name returns now correct values for HG users who are not on the region. 
Signed-off-by: Oren Hurvitz <orenh@kitely.com>
 2015-08-02 09:17:50 +01:00
Cinder
a91f32e2c7 Guard against null AgentPrefs service in llGetAgentLanguage() 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-21 08:41:37 -07:00
Cinder
0fa94f222d Refactor AgentPreferences so that database operations happen centrally. the opensim way. 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-13 07:27:42 -07:00
Cinder
6f71d5c2c6 Support for Linden AgentPreferences capability and friends (UpdateAgentLanguage and UpdateAgentInformation) and Mantis #7157 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-13 07:27:01 -07:00
Magnuz Binder
dcf31ee762 Correct constant RCERR_CAST_TIME_EXCEEDED. 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-06-01 13:09:05 -04:00
dahlia
5d3c327e93 Add a new os function "osGetGender()" 2015-05-29 23:02:12 -07:00
Cinder
0af17c9484 llListRandomize() wasn't very random 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-05-27 11:15:09 -07:00
Melanie Thielker
9766dc1f81 Add WhiteCore's LL Json functions 2015-05-26 21:05:59 +02:00
Magnuz Binder
abb3bb60a6 Fix mesh cache race condition in llCastRay V3. 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-05-23 08:14:28 -04:00
Magnuz Binder
fdc383a843 Use own mesh cache in llCastRay V3 after throttling. 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-05-22 01:21:50 -04:00
Magnuz Binder
7d26815d0e Throttle llCastRay V3. 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-05-22 01:21:18 -04:00
Melanie Thielker
edcba95ab5 Merge branch 'master' into moses 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2015-05-20 23:40:52 +02:00
Talun
d9afe354ac New values returned by llGetEnv 
Implements recent changes to llGetEnv
region_cpu_ratio hardcoded to 1
region_product_sku hardcoded to OpenSim

Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2015-05-20 14:36:54 -04:00
Michael Heilmann
140ea04b9d Merging Opensim upstream before generating patch 2015-05-19 15:18:45 -04:00