be3939358b
Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 01:47:35 +01:00
506769c6a2
Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmerge
2011-10-25 01:43:27 +01:00
53caaa8236
Merge commit 'ceb326284e49f0817fa0f848136ff60e6f66568f' into bigmerge
2011-10-25 01:43:12 +01:00
747786aac0
Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge
2011-10-25 01:43:05 +01:00
d68b73bfba
Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge
2011-10-25 01:42:56 +01:00
a8cc81a37e
Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 01:42:52 +01:00
9ceb98344a
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
2011-10-25 01:37:11 +01:00
13d635d1d7
Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge
2011-10-25 01:37:01 +01:00
8e69dde397
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:36:39 +01:00
0b833c458a
Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge
2011-10-25 01:35:51 +01:00
b8352c153b
Merge commit '36e73dbc9b7fb46885865f5537c43a29239fd559' into bigmerge
2011-10-25 01:35:38 +01:00
080a41e9f9
Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge
2011-10-25 01:35:30 +01:00
5f025d20fe
Fix ground sit autopilot
2011-10-25 00:53:39 +02:00
4a6160e7ad
Fake an AgentCircuitData if none is available rather than crashing out
2011-10-24 18:22:36 +02:00
8cca9fe23c
Allow updating the movement animation while flying. This fixes falling,
...
splatting and ground sit. Walking to a ground sit still doesn't work.
2011-10-21 03:15:56 +02:00
fd0e65b0b1
Fix up the animator and ScenePresence to like each other again
2011-10-20 23:11:53 +02:00
3cf7fb4eca
Add "scripts suspend" and "scripts resume" commands.
...
These aim currently to suspend and resume all scripts.
However, resume isn't currently working due to what looks like a bug in resume functionality itself.
2011-10-19 20:53:24 +01:00
b45219065c
on log and "show scripts" messages, show script item UUID rather than asset UUID
...
The item ID is the one required for any script manipulation on the command line, so I think it's somewhat more useful to show this bearing in mind the limited space available
2011-10-19 20:26:05 +01:00
116fbe8258
add current script status to "scripts show" command (running, suspended, etc.)
2011-10-19 20:24:07 +01:00
ecad9f9fd5
Add "show scripts" command to show all scripts currently known to the script engine in the current region.
...
Also added synonym of "scripts show"
2011-10-19 20:09:02 +01:00
d9184eceab
Add option to allow remote http calls to setpassword in the AuthenticationService.
...
This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini
Default is false as before.
2011-10-19 19:03:17 +01:00
fe484ab331
Slightly change log message in LoadRegionsPlugin
2011-10-19 01:22:07 +01:00
178b8d0926
Region-UUID - can not be zero-uuid
...
http://opensimulator.org/mantis/view.php?id=3426
2011-10-19 01:19:21 +01:00
4cffdf15ba
Make ScopeID optional for http GetAccount and GetAccounts
...
If not specified then it assumes UUID.Zero. as occurs elsewhere in the codebase
2011-10-19 00:34:54 +01:00
9f171041c9
Make PrincipalID a synonym for UserID in GetUserAccount
2011-10-19 00:23:06 +01:00
97c66f8eac
Get new NewUser and SetUserAccount calls to accept PrincipalID instead of UserID for consistency with output
2011-10-19 00:16:53 +01:00
9d59b285bb
Allow an http call to set account details if AllowSetAccount = true in [UserAccountService].
...
As before, default is false to not allow these calls.
2011-10-19 00:06:40 +01:00
c85a780583
Provide an option to allow remote calls to the CreateUser method on the UserAccountService
...
Default is false, as before.
Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces.
Only Ruths can be created at present.
Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
2011-10-18 22:51:40 +01:00
581885da75
Temporarily put in log lines to record time taken to set terrain in OdeScene.
2011-10-18 21:21:15 +01:00
03202ada29
Store scene identifier passed in to OdeScene for later debug messages
2011-10-18 21:11:13 +01:00
1d4cd76e8a
Don't bother taking OdeLock during OdeScene construction, since there can be no contention until the object is constructed.
2011-10-18 21:03:41 +01:00
f10a824e47
Remove unnecessary lock of OdeLock in OdePrim.changeadd()
...
This taint can only ever be processed from the OdeScene.Simulate() loop, which already locks OdeLock.
2011-10-18 20:58:59 +01:00
5515c45e3b
minor: method doc to explain a lock of OdeLock
2011-10-18 20:56:11 +01:00
71d221cdc0
Remove the unused CollisionLocker from ODE
...
Despite its name, this wasn't actually being used in any collision checking
2011-10-18 17:35:58 +01:00
352002fd0b
Set enable_adaptive_throttles = true in OpenSimDefaults.ini
...
As discussed in http://lists.berlios.de/pipermail/opensim-dev/2011-October/010599.html and the preceeding thread mails,
the aim of this setting is to avoid overloading the viewer UDP connection where the client is failing to ack packets.
Please mantis any anomalous viewer connection behaviour which wasn't there before.
2011-10-17 22:11:56 +01:00
aeb4ff0274
Allow an avatar to be explicitly named to the "debug packet" command
2011-10-17 20:58:23 +01:00
120114e96b
refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter without a getter
2011-10-17 20:50:29 +01:00
96ff2c63ed
Add avatar names to debug packet output
2011-10-17 20:37:01 +01:00
62a63f834b
refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSitTarget() which returned exactly the same thing
2011-10-17 02:04:20 +01:00
79c13cd997
rename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more understandable
...
This makes something like osNpcSit(npc, llGetKey(), OS_NPC_IMMEDIATE) now become
osNpcSit(npc, llGetKey(), OS_NPC_SIT_NOW);
This is why it's in development :)
2011-10-17 01:57:23 +01:00
de161585c0
Implement osNpcStand(<npc-id>)
...
Allows you to stand an NPC that has sat.
2011-10-17 01:56:25 +01:00
ddcb88ff53
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-17 01:45:41 +01:00
0c041ce12f
Implement osNpcSit(). This is still in development so don't trust it
...
Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE)
e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE);
At the moment, sit only succeeds if the part has a sit target set.
NPC immediately sits on the target even if miles away - they do not walk up to it.
This method is in development - it may change so please don't trust it yet.
Standing will follow shortly since that's kind of important once you're sitting :)
2011-10-17 01:42:31 +01:00
730460169f
Bug fix on the bug fix on UserAccountService.cs
2011-10-16 16:13:24 -07:00
bbd0e68c06
Guard HGAssetService against uninitialized variables and null arguments.
2011-10-15 20:23:26 -07:00
b9930a6305
improve method doc on Scene.OtherRegionUp()
...
this is really just to trigger panda.
2011-10-15 03:17:58 +01:00
ddf54b5537
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
2011-10-15 03:03:05 +01:00
528cc8136e
fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params
2011-10-15 02:54:43 +01:00
5ddefc2564
remove now redundant m_physical_prim flag from SOP.ApplyPhysics()
2011-10-15 02:47:27 +01:00
3843efe478
Restore [Startup] physical_prim flag which can stop any prims being subject to physics
...
This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed.
Default for this flag is true as previously.
2011-10-15 02:42:43 +01:00
Melanie