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
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
601dabb1b7
Extend scripts stop/start/suspend/resume console commands to allow action on a single script by giving the script item id (which can be found via scripts show).
...
Not an ideal way to do this on a region with many scripts. Needs refinement later.
2011-10-19 22:30:31 +01:00
32c3faedd6
Add "scripts stop" and "scripts start" console commands.
...
These will stop all running scripts and start all stopped scripts respectively.
A stopped script does not save any events for later processing.
2011-10-19 21:40:28 +01:00
f836710af5
minor: improve command help on scripts suspend/resume
2011-10-19 21:34:55 +01:00
5607fd3af8
Fix resume scripts.
...
On resume, we need to place requeue the script for event processing if there are any events on the queue.
Also need to do this under m_Script lock in order to avoid a race
2011-10-19 21:30:37 +01: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
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
f2889d7ce9
remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its done immediately afterwards in DoPhysicsPropertyUpdate()
2011-10-15 02:12:46 +01:00
732e937379
refactor: Remove redundant code in SOP.UpdatePrimFlags()
2011-10-15 02:07:05 +01:00
c93c9ea072
factor common code out into SOP.RemoveFromPhysics()
2011-10-15 02:02:39 +01:00
978fb3d482
reduce access to ODECharacter methods to make code analysis easier. Eliminate redundant argument on ProcessTaints()
2011-10-15 01:41:39 +01:00
9cc2694776
restrict unnecessary access levels on ODEPrim fields/properties
2011-10-15 01:31:09 +01:00
f2132329a3
refactor: make methods that do not need to be public in ODE private or internal to aid code reading/analysis. Remove some unused method arguments
2011-10-15 01:20:40 +01:00
4bfc2f5cde
Change hardcoded ODE total frame time to match the default total frame time (0.09375 -> 0.089).
...
No apparant ill effects - because the default stepsize is 0.2, there are still 5 physics steps per physics frame.
This is a precursor to using the elapsed value passed in (and now changeable in config).
2011-10-14 21:07:57 +01:00
83c7b9b609
Bug fix -- Test User on first run standalone might not be created properly: let all instances of UserAccountService have all its service references properly initialized, and register console commands on only one.
2011-10-13 18:03:19 -07:00
aa19ccf65c
refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims.
2011-10-14 01:45:46 +01:00
77c65951e0
Extract NullPhysicsScene from PhysicsScene to improve code readability
2011-10-14 01:38:14 +01:00
ee84c0589c
Don't execute rest of code in XEngine.RemoveRegion() and Close() if the module is disabled.
2011-10-14 01:06:43 +01:00
4e7d4330c2
Expose minimum frame time and update periods for experimentation.
...
Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change
Defaults are the same as previously.
More information to come on opensim-dev shortly.
Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested.
2011-10-13 23:47:37 +01:00
128d8dfd8b
refactor: Put the frame update period when temporary objects are cleaned up in a field, like all the other update periods
2011-10-13 22:28:42 +01:00
fd274a6688
refactor: chain the two scene constructors together to eliminate more copypasta
2011-10-13 22:21:03 +01:00
a6fa15e8b6
Tie reported FPS correction factor into the minimum frame time rather than setting separately.
...
This makes reported FPS scale as required if min frame time changes
2011-10-13 22:07:55 +01:00
ceb326284e
Move fps stat adjustment factor into field rather than hard-coded.
2011-10-13 21:55:51 +01:00
20da04fd0c
More method doc and formatting changes. Makes DestroyOdeStructures() private
2011-10-13 21:42:24 +01:00
227db07f2f
refactor: move 3x copy/pasted ode structure removal code in ODECharacter into a DestroyOdeStructures() method
...
also adds some method doc
2011-10-13 18:19:13 +01:00
f08664f422
remove some mono compiler warnings
2011-10-12 21:54:25 +01:00
631d5e16ef
Get rid of some traces of the old pre-ROBUST grid architecture config
2011-10-12 21:51:34 +01:00
f5f7ca47ea
Bring LindenUDP.Tests back from the dead. No tests are running.
...
Code drift means that most of this stuff doesn't compile but the structure is still useful.
2011-10-12 21:31:22 +01:00
ea7366ddc6
When shutting down XEngine, log how many scripts are being shutdown so the user knows why they are waiting.
2011-10-12 19:42:04 +01:00
c5826d589a
minor: insert some commented out log lines which are a blunt but useful instrument to see packet expiry and received acks
2011-10-12 19:35:40 +01:00
36e73dbc9b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-12 19:24:03 +01:00
f9ffd2538f
Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection
2011-10-12 19:22:30 +01:00
35def547f7
Merge branch 'master' into bigmerge
2011-10-12 16:45:48 +01:00
4b7b9e81f7
Make it possible to disable the HG linker. On non-HG systems it spits yellow
...
spam, so it should not load unless HG is desired.
2011-10-12 15:41:59 +01:00
ca74088d94
Change default groups messaging module in hardcode to the empty string.
...
Modules should not assume thet they are the one and only, but only be
enabled when explicitly configured.
2011-10-12 09:21:46 +01:00
d2dc2316c2
Merge branch 'master' into bigmerge
2011-10-12 09:26:35 +01:00
1d379a9c7b
Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken
2011-10-12 07:46:13 +02:00
e3effc4974
Merge branch 'master' into bigmerge
2011-10-12 07:29:35 +01:00
4b069d23d0
Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge
2011-10-12 07:24:53 +01:00
816d0de11a
Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge
2011-10-12 07:24:46 +01:00
628ca122b8
Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmerge
2011-10-12 07:24:34 +01:00
de109797f2
Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge
2011-10-12 07:24:26 +01:00
cc637b78fb
Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge
2011-10-12 07:24:13 +01:00
ad46ad1ab2
Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge
2011-10-12 07:23:54 +01:00
98ae98510c
Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge
2011-10-12 07:23:40 +01:00
5d3acc9ac3
Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge
2011-10-12 07:23:32 +01:00
b716d98e23
Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmerge
2011-10-12 07:23:18 +01:00
3657cd436c
Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge
2011-10-12 07:23:08 +01:00
cc4b1c69d8
Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge
2011-10-12 07:23:02 +01:00
3a290e581a
Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge
...
Conflicts:
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
2011-10-12 07:09:41 +01:00
2c23fc9e68
Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge
2011-10-12 07:09:04 +01:00
d03d486dbb
Merge commit 'ff80113534182bbcbcb49a73035776134fb04e3e' into bigmerge
2011-10-12 07:08:46 +01:00
2f6cc77154
Adjust CM version tag
2011-10-12 07:08:23 +01:00
336f6f7ec4
Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge
2011-10-12 07:07:37 +01:00
492a50d6f7
Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmerge
2011-10-12 07:06:59 +01:00
e18a76f6d6
Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge
2011-10-12 07:05:57 +01:00
00285082d8
Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge
2011-10-12 07:05:47 +01:00
Melanie