35cbe76f27
Merge branch 'master' of opensimulator.org:/var/git/opensim
2015-08-19 23:34:13 +02:00
20326e1947
Fix a possible nullref caused by accessing m_data rather than Data
2015-08-19 23:33:38 +02:00
7633ebf36f
Add explicit initialization because mono 3 doesn't like what mono 2 allows
2015-08-19 23:18:40 +02:00
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
9a0040d67c
put back entities remove from updates on SendKillObject.
2015-08-19 20:38:49 +01:00
ac83525bde
another funny bug (mine this time)
2015-08-19 19:55:24 +01:00
d2776ec645
funny bug
2015-08-19 17:14:29 +01:00
601914ecd8
find sending of initial terrain using PushTerrain as os core
2015-08-19 16:28:03 +01:00
7661366223
minor change
2015-08-19 15:24:12 +01:00
abeb2ec4b3
ubitode varsize ( Mega disabled till better checks )
2015-08-19 14:26:14 +01:00
2e15ed80cd
fixes on warp3D
2015-08-19 12:08:45 +01:00
0af2fafddf
add missing regionExtent setup and Scene physicsscene configuration ( not
...
exactly as core)
2015-08-19 11:04:28 +01:00
0b105da626
Merge branch 'mbworkvar2' into ubitvar
2015-08-19 08:48:50 +01:00
f17b5c5985
Merge branch 'master' into ubitworkmaster
2015-08-19 02:47:14 +01:00
fd82a0a0b7
add a Retry-After response header to the 503 sent when we are 2 busy to do
...
the request. just 503 could mean server down (?)
2015-08-19 00:26:43 +01:00
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
72dba594af
Merge branch 'ubitworkmaster'
2015-08-19 01:09:24 +02:00
c61aee12d4
Fix adding a scalar to the end of a list
2015-08-19 01:04:10 +02:00
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
48ef22f62e
change pollService stop() to send 503 error and no keepalive. ( untested )
2015-08-18 23:59:55 +01:00
05d72f77ff
do keepalive on mesh and texture GET. Dont use reusecontext any where.
...
setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
2015-08-18 21:32:03 +01:00
2cac56340a
try to serialize http requests from same connection, so they are processed
...
in order. ( next commits will be about necessary keepAlive changes needed)
2015-08-18 21:03:34 +01:00
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
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
1de5612d8b
Merge branch 'master' of opensimulator.org:/var/git/opensim
2015-08-17 18:08:32 +02:00
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
0cdd1165c8
Minor improvement of previous patch.
2015-08-16 21:23:41 -07:00
fc6fe75268
MANTIS-7684 - Use the user management module to get username for script dialogs
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-08-16 21:13:42 -07:00
ce2aeb8424
Make Setup_XXX=disabled not even load the module at all, rather than
...
loading and not using it
2015-08-16 19:01:23 +02:00
c83da03183
Create want and need lists for agent data interchange formats.
2015-08-16 01:45:15 +02:00
0f8a7982dc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-08-15 16:08:42 -07:00
4cbbbefbf6
Removed ignoreCase=true from the call to Type.GetInterface, because, well, we don't want to ignore case. And this seems to be causing problems in mono 4.3.
2015-08-15 16:08:14 -07:00
2374c4a4c1
Adding the IAgentStatefulModule interface. It is used in addtion to
...
one of the existing module interfaces to denote a module that holds
agent specific state that should be transferred to other regions
2015-08-15 19:08:45 +02:00
83059724ee
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-08-14 19:20:20 -07:00
d70db51466
Only send the requested ObjectPropertiesFamily in the RequestObjectPropertiesFamily reply and not the actual ObjectProperties packet
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-08-14 19:19:49 -07:00
1fb2f0296f
Track selected objects per client
2015-08-15 02:46:41 +02:00
4f3198da22
Only send the requested ObjectPropertiesFamily in the RequestObjectPropertiesFamily reply and not the actual ObjectProperties packet
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-15 01:57:25 +02:00
1bfdc9f32b
Update libomv managed dlls to 49a5cf05c32e
2015-08-14 16:55:06 -07:00
a5967d918a
Send a proper ownerid for Object messages to conform with what viewer expects
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-15 01:18:20 +02:00
e9067c133c
Remove DOS line endings from LSL_API.cs
2015-08-13 01:34:18 +02:00
a22e6cb7f5
Whitespace borkness?
2015-08-12 09:13:45 -07:00
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
0b5385ffce
Added *.Tests.log to .gitignore
2015-08-11 11:55:51 +03:00
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
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
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
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
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
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
20af31f18e
Fixed mistakes related to confusion between Environment.TickCount (milliseconds) and TimeSpan.TicksPerXXX (10000 x milliseconds)
2015-08-11 07:35:40 +01:00
Melanie Thielker