2d3a57a002
Merge branch 'avination'
...
Conflicts:
OpenSim/Framework/ThrottleOutPacketType.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
2013-01-19 21:49:33 +01:00
7bd9a0edb7
Remove group IM test code also mentioning "OpenSimulator Testing"
2013-01-19 14:30:38 +01:00
bd77e2b7ba
Remove the core groups module
2013-01-19 14:29:09 +01:00
1323271826
Kill the dumb Opensimulator Testing group again - for good.
2013-01-19 13:21:43 +01:00
9c590e51b6
IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in OpenSimDefaults.ini / section [IRC]
...
http://opensimulator.org/mantis/view.php?id=6470
idea: https://github.com/ssm2017/IrcBridgeAlert
2013-01-19 02:40:28 +00:00
12efac494a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
2013-01-19 02:38:04 +00:00
41ae006e9b
minor: adjust formatting in TESTING.txt to make headers more wiki-like
2013-01-19 02:32:41 +00:00
fc6115f777
Check the existing ScenePresence.ParentPart to make sure we're not trying to sit on a prim we're already sat upon, rather than looking up the part from scratch.
...
An adaptation of commit 055b8a2
2013-01-19 02:29:02 +00:00
b77da5039e
Assign the SmartThreadPool name in the constructor
...
This is required because some threads are created in the constructor, so assigning the name afterwards would be too late.
2013-01-19 02:08:58 +00:00
3eee991935
Explicitly stop PollServiceRequestManager() rather than relying on its destructor.
...
Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
2013-01-19 02:04:36 +00:00
27e2ec177a
New constants for llGetObjectDetails
...
New constants for llGetObjectDetails OBJECT_CHARACTER_TIME,
OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE,
OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ
also Pathfining constants, 3 of which are used by llGetObjectDetails
2013-01-19 01:50:16 +00:00
607558fe21
New constants for llGetObjectDetails
...
New constants for llGetObjectDetails OBJECT_CHARACTER_TIME,
OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE,
OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ
also Pathfining constants, 3 of which are used by llGetObjectDetails
2013-01-19 01:18:04 +00:00
4f70e423df
Mantis 6507 keys returned by llGetAgentList incorrect for llList2Key
...
The type of the keys returned by llGetAgentList corrected to LSL_Key
2013-01-19 01:14:11 +00:00
652cfa2ee2
Fix use of scene debug commands when region is set to root or a specific region where there is more than one region on the simulator.
2013-01-19 00:27:17 +00:00
115e1c2abb
Add "debug set set animations true|false" region console command.
...
Setting this logs extra information about animation add/remove, such as uuid and animation name
Unfortunately cannot be done per client yet
2013-01-18 23:22:02 +00:00
74256c0cc4
Restore previous client AO behaviour by not allowing them to remove the default animation but continue to allow scripts to do so.
...
This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327
and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483
Animations may still exhibit different behaviour if both scripts and clients are adjusting animations.
A change in the behaviour of client AO to not remove all animations may be a better long term approach.
2013-01-18 22:57:09 +00:00
c6b6c94ccb
BulletSim: reduce jitter in avatar velocity when walking or flying.
...
OpenSimulator is VERY sensitive to changes in avatar velocity and
will send an avatar update message when velocity changes more than
0.001m/s. This significantly reduces the number of avatar update messages by
smoothing the avatar velocity returned by Bullet.
2013-01-18 11:39:24 -08:00
482c7b5368
BulletSim: add logic to turn off pre-step actions when object goes
...
non-active. This turns off 'setForce', 'setTorque' and 'moveToTarget'
when the object is selected or made non-physical.
2013-01-18 11:37:36 -08:00
9aad815177
Merge branch 'master' into careminster
2013-01-18 19:35:09 +00:00
c8afc8523b
Implement non-wait co-operative termination of scripts for XEngine in addition to termination on wait.
...
This involves inserting opensim_reserved_CheckForCoopTermination() calls in lsl -> c# translation at any place where the script could be in a loop with no wait calls.
These places are for, while, do-while, label, user function call and manual event function call.
Call goes through to an XEngineScriptBase which extends ScriptBase.
IEngine is extended to supply necessary engine-specific parent class references and constructor parameters to Compiler.
Unfortunately, since XEngineScriptBase has to be passed WaitHandle in its constructor, older compiled scripts will fail to load with an error on the OpenSim console.
Such scripts will need to be recompiled, either by removing all *.dll files from the bin/ScriptEngines/<region-id> or by setting DeleteScriptsOnStartup = true in [XEngine] for one run.
Automatic recompilation may be implemented in a later commit.
This feature should not yet be used, default remains termination with Thread.Abort() which will work as normal once scripts are recompiled.
2013-01-17 23:39:09 +00:00
a6afd2f706
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-17 14:51:52 -08:00
75f710f1e7
BulletSim: Add one function that all actors who act on the physical
...
can use to know if the object is currently active.
Code cleaning including use of Util.ClampV function.
2013-01-17 14:47:35 -08:00
caad1edabf
Add utility function to clamp a vector to a maximum magnitude.
2013-01-17 14:44:54 -08:00
63e9b2d330
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-17 04:32:39 +01:00
755e452342
revert the test, sending again appearance to self in
...
ValidateAndSendAppearanceAndAgentData()
2013-01-17 03:29:38 +00:00
3b1e4541fb
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-17 03:45:25 +01:00
2743565f7e
*TEST TEST TEST* don't send AvatarAppearance to self
2013-01-17 02:43:29 +00:00
777c80becb
Merge branch 'ubitwork' into avination
2013-01-16 23:37:27 +01:00
3e0e9a0962
* Enables loading cached bakes on teleport by filling in the appropriate avatar fields from the bake data. No more auto rebaking on teleport assuming your wearables, bakes and cache are consistent.
...
* Speeds up appearance sending.. since there's nothing to wait for.
2013-01-16 17:59:13 -05:00
670bb9cb8b
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
2013-01-16 17:52:02 -05:00
13e7085124
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 23:19:29 +01:00
de49440839
dont send a full grp update on stopmovetotarget. just a rootpart terse
2013-01-16 22:17:10 +00:00
ed735ffdd0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 21:57:06 +01:00
30d5faa7fc
same for SetPrimParams
2013-01-16 20:55:16 +00:00
3d0f4b0ccb
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 21:35:13 +01:00
2464e65c8a
llSetPos on child prim, send only a part terse update and not a group one
2013-01-16 20:27:10 +00:00
5b86af36e6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 20:23:45 +01:00
582cb89beb
Add a way to put things at the front of the queue for any throttle group.
...
Adds a DoubleLocklessQueue and uses it for the outgoing buckets. Added
a flag value to the Throttle Type (again) because although it's hacky, it's
the best of a bad bunch to get the message through the UDP stack to where it's
needed.
2013-01-16 19:29:27 +01:00
206bfe0657
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
2013-01-16 17:05:37 +00:00
9c99ed26eb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-01-16 16:52:57 +00:00
5563a8916e
Complete removal of the now unused state queue
2013-01-16 16:45:18 +00:00
37fcf87946
Changed a couple of debug messages at the request of osgrid.
2013-01-16 08:20:32 -08:00
9910c5f8e1
Merge branch 'avination' into careminster
2013-01-16 15:50:34 +00:00
5c8cced0a1
Merge branch 'ubitwork' into avination
2013-01-16 16:47:59 +01:00
818254916c
JustinCC's core re-merge
2013-01-16 15:47:55 +00:00
518326b049
Merge branch 'ubitwork' into avination
2013-01-16 16:47:21 +01:00
91138014e2
Change all uses of the removed state queue to the task queue for now.
2013-01-16 17:12:56 +00:00
85aa1804df
Complete removal of the now unused state queue
2013-01-16 17:06:25 +00:00
d92d5ca1fd
Revert " fix STATE udp queue data rate since it is in use again, after being"
...
This reverts commit 4d92c6b39f
2013-01-16 16:46:43 +01:00
778ed1c05a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 16:35:09 +01:00
Melanie