Justin Clark-Casey (justincc)
cfce2529ad
refactor: In sit code, compare against Vector3.Zero and Quaternion.Identity instead of individual components of a vector/quat
2011-11-05 02:04:48 +00:00
Justin Clark-Casey (justincc)
8105794121
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-05 01:42:20 +00:00
Justin Clark-Casey (justincc)
28c4dc9be4
Fix NPC sitting for prims without a sit target.
...
This is to partially address http://opensimulator.org/mantis/view.php?id=5769
We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger.
By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>.
However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent).
Hopefully this can be addressed soon.
2011-11-05 01:38:42 +00:00
Melanie
b199aad037
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-05 00:11:10 +00:00
Melanie
c803ed28c3
Replacing te linking code with the code from Avination. Link sets prims are now
...
numbered properly even when sets are linked to sets.
2011-11-05 00:09:37 +00:00
Justin Clark-Casey (justincc)
f7b8c54c24
Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPrim.changevelocity()
2011-11-04 23:43:17 +00:00
Justin Clark-Casey (justincc)
d7815ace4a
On standup, trigger the changed link script event after the avatar has been fully changed.
...
This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work.
Probably the event is fired before the physics actor has been set up again for the stood avatar.
Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
2011-11-04 23:24:22 +00:00
Melanie
b9f7aebde3
Merge branch 'master' into bigmerge
2011-11-04 23:21:19 +00:00
Justin Clark-Casey (justincc)
ccca6ba935
Stop llPushObject() from causing problems by adding force via a taint rather than directly.
...
This isn't a perfect solution since there can be a race between the taint processing and taint setting, as force needs to be reset after processing.
Needs careful locking in the future.
2011-11-04 23:12:01 +00:00
Melanie
24235006f4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
Dan Lake
b8d50b10fb
Rename ForEachAvatar back to ForEachScenePresence. The other changes
...
from previous commit which sort out which iterator is used are left
intact. A discussion is needed as to what constitutes an avatar vs a
ScenePresence.
2011-11-03 17:53:51 -07:00
Dan Lake
94dc7d07eb
Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to
...
the 3 iteration functions so more of them are using the correct
iteration for the action they are performing. The 3 iterators that seem
to fit all actions within OpenSim at this time are:
ForEachAvatar: Perform an action on all avatars (root presences)
ForEachClient: Perform an action on all clients (root or child clients)
ForEachRootClient: Perform an action on all clients that have an avatar
There are still a dozen places or so calling the old
ForEachScenePresence that will take a little more refactoring to
eliminate.
2011-11-03 17:06:08 -07:00
Justin Clark-Casey (justincc)
69a4057135
remove the pointless check of the face texture struct against null in Bot.Objects_NewPrim()
2011-11-03 22:52:14 +00:00
Justin Clark-Casey (justincc)
e4bdf1e78f
actually remove the sleep from PhysicsBehaviour that I shifted to Bot a couple of commits ago
2011-11-03 22:50:40 +00:00
Justin Clark-Casey (justincc)
f26fdbd8da
Rename PhysicsBot => Bot since it doesn't just exercise physics anymore
2011-11-03 22:39:06 +00:00
Justin Clark-Casey (justincc)
ca2c25ece2
Move one of the old physics sleeps out into the main bot loop, so leaving out PhysicsBehaviour doesn't result in continuous other behaviours
2011-11-03 22:35:21 +00:00
Justin Clark-Casey (justincc)
5a67940acc
Add click/grab behaviour to pCampbot, which gets bots to randomly click things.
...
This can be specified on pCampbot.exe by using g in the list of behaviours for the new -behaviours,-b switch
e.g. -b p,g to get both existing physics and grabbing behaviours.
grabbing is primitive, it attempts grabs on random prims whether they're actually signalled as clickable or not.
behaviour is currently primitive overall, behaviours are just executed in a list
2011-11-03 22:31:31 +00:00
Justin Clark-Casey (justincc)
3ea379e4cd
Move PhysicsBehaviour into a spearate behaviours folder
2011-11-03 21:25:27 +00:00
Justin Clark-Casey (justincc)
66c60c56a0
Separate out physics testing actions into a separate PhysicsBehaviour class
2011-11-03 21:16:24 +00:00
Justin Clark-Casey (justincc)
a62ccb5c4c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-03 20:12:10 +00:00
Mic Bowman
40a1eddfd1
Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size
...
not a target size. Mono 2.10 appears to try to allocate the full buffer which
immediately crashes. Tested on mono 2.6.7 and 2.10.5
2011-11-02 18:55:54 -07:00
Melanie
457195466d
Merge branch 'master' into bigmerge
2011-11-03 00:23:58 +00:00
Melanie
6b4ae4f30c
Revert "fix CopyTo call that was breaking under mono 2.10"
...
This reverts commit d30971fdc2
.
2011-11-03 00:23:32 +00:00
Mic Bowman
99a347ee11
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-02 17:11:10 -07:00
Mic Bowman
d30971fdc2
fix CopyTo call that was breaking under mono 2.10
2011-11-02 17:10:59 -07:00
Melanie
e746840226
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-02 23:51:48 +00:00
Melanie
08fcf958c2
Port the Avination offline messaging system to Core
2011-11-02 23:50:47 +00:00
Melanie
26a4f32013
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-02 23:42:37 +01:00
Melanie
afde92d8cc
Merge branch 'master' into bigmerge
2011-11-03 00:07:29 +00:00
Melanie
243acef917
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-03 00:06:14 +00:00
Melanie
ce8419fdd0
Fix link order when linking sets to sets
2011-11-02 23:42:09 +01:00
Dan Lake
a724ebacd7
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-02 14:59:34 -07:00
Dan Lake
e2c51a977d
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
...
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".
UpdateFlag and Schedule*Update will both be made private shortly.
UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
2011-11-02 14:59:00 -07:00
Justin Clark-Casey (justincc)
59232a6ea8
Change default say distance to 20m from 30m, the same as on the big grid. This is to improve the migration of scripts that expect a 20m say distance.
...
If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
2011-11-02 20:05:31 +00:00
Justin Clark-Casey (justincc)
72923134e9
Get some hopefully more useful exception information when OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules
2011-11-02 18:40:49 +00:00
Justin Clark-Casey (justincc)
03993d0b14
Fix race condition that would sometimes send or save appearance for the wrong avatar.
...
In AvatarFactoryModule.HandleAppearanceUpdateTimer(), we loop through appearance save and send requests and dispatch via a FireAndForget thread.
If there was more than one request in the save or send queue, then this led to a subtle race condition where the foreach loop would load in the next KeyValuePair before the thread was dispatched.
This gave the thread the wrong avatar ID, leaving some avatar appearance cloudy since appearance data was never sent.
This change loads the fields into local references so that this doesn't happen.
2011-11-02 18:25:03 +00:00
Justin Clark-Casey (justincc)
b6873a7b5d
Catch any exceptions exiting the top of the robust console, as we already do for the main simulator.
...
This prevents issues such as transient mono console problems from crashing the server.
2011-11-02 13:16:02 +00:00
Melanie
afae9eafbe
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-02 12:34:57 +00:00
Melanie
c5fb39e21f
Restore the recursive calling of PRIM_LINK_TARGET because the version I made
...
breaks LINK_SET et al.
2011-11-02 12:09:18 +00:00
Melanie
1b9ae3fb51
Some positioning fixes from AVN trunk
2011-11-02 12:02:44 +00:00
Melanie
c55e161dc4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-02 11:49:25 +00:00
Melanie
b9e700b60d
Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario
2011-11-02 11:43:16 +00:00
Dan Lake
7c8bfac11b
Removed redundant SceneContents property from Scene. It's the same as SceneGraph property.
2011-11-01 17:20:12 -07:00
Dan Lake
3bead3eb50
Part 2 of see_into_this_sim_from_neighbor configuration option removal
2011-11-01 17:11:43 -07:00
Melanie
9a8715ec9a
Merge branch 'master' into bigmerge
2011-11-02 00:07:59 +00:00
Melanie
b69f679122
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2011-11-01 23:54:09 +00:00
Dan Lake
4b58d4ff95
Removed see_into_this_sim_from_neighbor configuration option.
2011-11-01 16:51:14 -07:00
Justin Clark-Casey (justincc)
9456a540c5
Add "appearance send" command to allow manual sending of appearance.
2011-11-01 23:23:45 +00:00
Justin Clark-Casey (justincc)
8e2e4c47d9
Add "show status" command to pCambot
2011-11-01 22:09:21 +00:00
Justin Clark-Casey (justincc)
40750b44a0
Listen only for non SimShutdown Network.Disconnect firing so that we don't quite the program before all bots have actually logged off.
2011-11-01 21:47:14 +00:00
Justin Clark-Casey (justincc)
53f3b76a84
get rid of unused m_verbose field
2011-11-01 21:18:28 +00:00
Justin Clark-Casey (justincc)
12bd0ebd34
stop recording the threads on which we happen to start bots. These are pointless since they terminate quickly
2011-11-01 21:15:47 +00:00
Justin Clark-Casey (justincc)
9ef5107157
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-01 21:02:03 +00:00
Justin Clark-Casey (justincc)
87ec8a4ecb
Retain a reference to an action thread rather than starting an infinite loop via a timer, so that we can actually abort the action thread on shutdown
2011-11-01 18:36:29 +00:00
Dan Lake
9d214d4903
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-31 16:42:50 -07:00
Dan Lake
3c55f3015f
Removed unused show commands from Scene.cs and SceneBase.cs. The show modules command in OpenSim.cs now shows both shared modules and region modules.
2011-10-31 16:42:28 -07:00
Justin Clark-Casey (justincc)
b951c7fb1e
Make bots share a cache so that asset downloads attempts are only made once instead of once for each bot
2011-10-31 23:22:55 +00:00
Justin Clark-Casey (justincc)
210868a832
Remove OpenSim.TestSuite
...
Hasn't been touched since 2009 and wasn't more than another copy of pCampBot
2011-10-31 23:10:10 +00:00
Justin Clark-Casey (justincc)
d366a08ebb
Stop individual bots attempting to download the same asset more than once
2011-10-31 22:52:49 +00:00
Justin Clark-Casey (justincc)
0c6509098a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-31 22:27:35 +00:00
Justin Clark-Casey (justincc)
43e07efbc8
Fix bot disconnection
2011-10-31 22:27:12 +00:00
Dan Lake
3a2dcc7298
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-31 15:21:39 -07:00
Dan Lake
d3153f47fa
Adding green dots to map response should be for root agents only
2011-10-31 15:20:57 -07:00
Justin Clark-Casey (justincc)
b1647f6d04
adjust pCampbot so it starts up bots with the name format "<firstname> <lastname>_<bot-number>"
...
e.g. starting up two bots called "Ima Bot" will give them the names "Ima Bot_0" and "Ima Bot_1"
This is necessary since bots with random names can no longer be created, as there's no easy way to turn off account authentication
2011-10-31 22:14:49 +00:00
Justin Clark-Casey (justincc)
e3f51df3c2
Stop pCampbot from firing connected event twice, which results in double counting.
2011-10-31 21:33:25 +00:00
Melanie
a9a24062a5
Plug a security hole in the inventory service
2011-10-31 11:11:36 +00:00
Melanie
4002e205cb
Merge branch 'master' into bigmerge
2011-10-31 10:53:17 +00:00
Melanie
e431d5dae4
Plug a security hole in the inventory service
2011-10-31 10:18:25 +01:00
Dan Lake
14646f2524
Fix line endings
2011-10-30 23:43:17 -07:00
Dan Lake
a85ff884d9
Experimental reorder of Heartbeat loop now simulates physics and sends updates to clients prior to sleep. Existing behavior was to sleep BEFORE sending updates. We found this patch reduced latency to clients by 1-2 heartbeat periods.
2011-10-30 23:39:39 -07:00
Melanie
083b28de8c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-30 10:16:25 +00:00
Justin Clark-Casey (justincc)
6d97545b6b
Remove the SyncRoot locking from Scene which was only being done around the main physics loop and ScenePresence position and velocity setting
...
This is no longer necessary with ODECharacter taints (ODEPrim was already not taking part in this). BSCharacter was already tainting.
2011-10-29 02:42:53 +01:00
Justin Clark-Casey (justincc)
9fdd1753fa
Add taint target velocity for ODECharacters as is already done for ODECharacter position and position and velocity for ODEPrims.
...
This is to help stop surprises if the velocity is set in the middle of physics calculations, though this probably isn't a huge problem.
It's more for consistency and for the next step of removing some scene locks
2011-10-29 02:30:33 +01:00
Justin Clark-Casey (justincc)
ef8370fb8e
tidy up OdeCharacter so that we just use OpenMetaverse.Vector3 assignment directly where possible, instead of transferring X, Y and Z components separately
...
some of this is probably a hold over from using ODE.Vector3, which is still necessary in some places.
2011-10-29 02:07:28 +01:00
Justin Clark-Casey (justincc)
a5ea9f8830
Move position set from taint to logically better position at top of ODECharacter.ProcessTaints() though this makes no practical difference
2011-10-29 01:46:22 +01:00
Justin Clark-Casey (justincc)
5ae8de3c00
Stop setting _position as well as m_taint_position in ODECharacter.Position
...
setting position at the same time as taint appears to undermine the whole purpose of taint
testing doesn't reveal any obvious regressions in doing this
2011-10-29 01:39:48 +01:00
Justin Clark-Casey (justincc)
61e97ee4c8
Remove completely unused SOG.Rotation parameter
...
We always use SOP.Rotation instead
2011-10-29 00:39:01 +01:00
Justin Clark-Casey (justincc)
c2da1c4580
set grp.RootPart.GroupPosition for code consistency (and readability) rather than calling SOP.OffsetForNewRegion
2011-10-28 23:43:31 +01:00
Justin Clark-Casey (justincc)
9bf8c3e7b7
Add missing doc to rotation/position methods in SOG
2011-10-28 23:38:57 +01:00
Justin Clark-Casey (justincc)
0fe756e42c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-28 23:16:46 +01:00
Justin Clark-Casey (justincc)
7b46506822
fetch SOP.RotationOffset once in UpdateRotation() and compare rather than fetch four separate times.
...
No functional change.
2011-10-28 23:15:51 +01:00
Melanie
175d74e68c
Fix the offline message module to revert core changes and restore avn
...
specific behavior
2011-10-28 23:10:54 +02:00
Melanie
9b6ce41b0e
Reduce severity and remove duplication if a common log message regarding
...
baked textures
2011-10-28 23:10:22 +02:00
Melanie
955144584d
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-10-27 17:45:51 +02:00
Melanie
b975cbcbed
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-27 18:14:38 +01:00
Dan Lake
272bf71279
Removed use of 'is' operator and casting to find the root ScenePresence in MessageTransfer modules and Groups module.
2011-10-27 02:26:37 -07:00
Dan Lake
06577d7299
Continuation of previous checkin. Found more places where ForEachScenePresence can be changed to ForEachRootScenePresence.
2011-10-27 01:25:12 -07:00
Dan Lake
b98613091c
Added new ForEachRootScenePresence to Scene since almost every delegate passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
2011-10-27 00:42:21 -07:00
Justin Clark-Casey (justincc)
40bee97015
For now, comment out error message on new script engine console commands.
...
This causes false positives if a simulator has more than 1 region and the current region is 'root' since this sends the command separately to each region and each region has its own XEngine
2011-10-27 03:01:27 +01:00
Justin Clark-Casey (justincc)
76c50d23f2
Comment out inventory folder bulk update code on InventoryAccepted message introduced in commit db91044
on Aug 22 2011
...
This should be unecessary since the folder update is already made at the time of the offer (and moved to trash if not accepted).
This code was also not taking into account the situation where an item was accepted.
Needs more fixing if this results in an aggression elsewhere.
2011-10-27 02:56:08 +01:00
Justin Clark-Casey (justincc)
e210d95821
Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly passed a null node reference.
...
Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752
2011-10-27 02:50:58 +01:00
Justin Clark-Casey (justincc)
2db6a8ce8f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-27 02:06:59 +01:00
Justin Clark-Casey (justincc)
820242bc49
Fix a bug I introduced yesterday in ODE physics where prim scripts would only receive the very first collision.
2011-10-27 02:05:59 +01:00
Melanie
6a96c9546d
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-26 17:48:51 +01:00
Melanie
c763419043
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-10-26 17:55:53 +02:00
Michelle Argus
41395d5443
Added optional owner classes to existing OSSL agent Permissions
...
PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 10:35:50 -04:00
SignpostMarv Martin
9a28e7a4e0
Implementation of PRIM_OMEGA, but only for setting
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 08:41:07 -04:00
SignpostMarv Martin
059f4b6a3a
Implementing PRIM_LINK_TARGET, but only for setting params
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 07:47:44 -04:00
Melanie
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc)
c275c22928
Restart the event queue worker threads that I accidentally disabled earlier today in 8a0a78c
.
...
Also adds these to the watchdogs with very large timeouts (should really be infinite)
2011-10-25 23:26:21 +01:00
Justin Clark-Casey (justincc)
182908d216
In Watchdog, add ability to specific timeout for a thread.
...
This also changes the point of registration to the StartThread() call rather than the first Update()
2011-10-25 23:16:01 +01:00
Justin Clark-Casey (justincc)
e549f2f443
Add m_threads dictionary locking to Watchdog.GetThreads()
2011-10-25 22:51:23 +01:00
Justin Clark-Casey (justincc)
6a74a4c12b
Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from collision events
2011-10-25 22:46:42 +01:00
Justin Clark-Casey (justincc)
0f83f87233
Remove unused fields from CollisionEventUpdate
2011-10-25 22:39:08 +01:00
Justin Clark-Casey (justincc)
c825c9a945
Get rid of the pointless null checks on collision listeners. Add warning about synchronicity for PhysicsActor.OnCollisionUpdate event doc
2011-10-25 22:35:00 +01:00
Justin Clark-Casey (justincc)
b9f106f484
When sending object collision updates, don't null out and recreate the CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead.
2011-10-25 22:28:40 +01:00
Justin Clark-Casey (justincc)
5d37f0471e
For ScenePresence collision events, instead of creating a new CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead.
...
This assumes that the listener is using the data synchronously, which is currently the case.
2011-10-25 22:19:17 +01:00
Justin Clark-Casey (justincc)
7b6b36cee9
Fix bug where collision event listeners were not removed once the listener had gone away.
...
This was causing continuous use of temporary memory even when all avatars had left the scene.
Memory does leak but it does cause more calls to the garbage collector, which would pause the scene thread for a very short while during collection.
2011-10-25 21:40:51 +01:00
Justin Clark-Casey (justincc)
1fbb379536
minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it's an OdePrim
2011-10-25 21:15:37 +01:00
Justin Clark-Casey (justincc)
a4d4f54848
minor: add "threads show" as synonym for "show threads" for consistency
2011-10-25 20:59:27 +01:00
Justin Clark-Casey (justincc)
968cae6c17
Add "threads abort <thread-id>" simulator console command that allows us to abort a watchdog managed thread.
...
This is for diagnostic purposes.
2011-10-25 20:49:46 +01:00
Justin Clark-Casey (justincc)
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
Melanie
27aca49a1f
Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge
2011-10-25 03:26:51 +01:00
Melanie
c8dfef1583
Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge
2011-10-25 03:26:44 +01:00
Melanie
a055dd39ac
Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge
2011-10-25 03:26:34 +01:00
Melanie
740077a291
Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge
2011-10-25 03:26:20 +01:00
Melanie
4e9457ca0c
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
...
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
2011-10-25 03:26:09 +01:00
Melanie
e94574196f
Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge
2011-10-25 03:19:55 +01:00
Melanie
271c798813
Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge
2011-10-25 03:19:49 +01:00
Melanie
84ea10a78c
Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge
2011-10-25 03:19:35 +01:00
Melanie
02f0aa592d
Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge
2011-10-25 03:19:10 +01:00
Melanie
8639b037e1
Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge
2011-10-25 03:18:59 +01:00
Melanie
de8cdbda15
Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge
2011-10-25 03:18:53 +01:00
Melanie
be2cfeb5c3
Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge
2011-10-25 03:18:49 +01:00
Melanie
da805d0cce
Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge
2011-10-25 03:18:38 +01:00
Melanie
56f3da7b5a
Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge
2011-10-25 03:18:29 +01:00
Melanie
1ae36695ba
Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge
2011-10-25 03:18:23 +01:00
Melanie
0531b73695
Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge
2011-10-25 03:18:10 +01:00
Melanie
564563d273
Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge
2011-10-25 03:18:04 +01:00
Melanie
6d4480c1ca
Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge
2011-10-25 03:17:59 +01:00
Melanie
3d0d84aff7
Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge
2011-10-25 03:17:45 +01:00
Melanie
e35835602f
Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge
2011-10-25 03:17:40 +01:00
Melanie
e058b0822f
Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge
2011-10-25 03:17:26 +01:00
Melanie
bfc0c96379
Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge
2011-10-25 03:17:18 +01:00
Melanie
d1028b3647
Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge
2011-10-25 03:17:11 +01:00
Melanie
04678836c3
Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge
2011-10-25 03:16:47 +01:00
Melanie
635b1bf18e
Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge
2011-10-25 03:16:40 +01:00
Melanie
85d40ce1d1
Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 03:16:26 +01:00
Melanie
df430d572d
Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 03:10:54 +01:00
Melanie
1bb0e3c800
Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 03:07:25 +01:00
Melanie
1ec82bb000
Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2011-10-25 03:06:18 +01:00
Melanie
89e973805d
Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge
2011-10-25 02:57:01 +01:00
Melanie
a71c60ee6d
Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge
2011-10-25 02:56:56 +01:00
Melanie
b6881187d0
Merge commit 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmerge
2011-10-25 02:56:45 +01:00
Melanie
752b744105
Merge commit '178b8d0926a53d82f54d60c088f36c7bad13dc87' into bigmerge
2011-10-25 02:56:40 +01:00
Melanie
1b87a0c229
Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmerge
2011-10-25 02:56:30 +01:00
Melanie
3555987fe9
Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmerge
2011-10-25 02:56:22 +01:00
Melanie
e1ff72209f
Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmerge
2011-10-25 02:56:15 +01:00
Melanie
cdca0fb387
Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge
2011-10-25 02:56:03 +01:00
Melanie
f5e2bdebef
Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge
2011-10-25 02:55:57 +01:00
Melanie
71b4486356
Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge
2011-10-25 02:55:46 +01:00
Melanie
6a01246cc6
Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge
2011-10-25 02:55:38 +01:00
Melanie
10dff1da7f
Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge
2011-10-25 02:55:25 +01:00
Melanie
2134f23da0
Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge
2011-10-25 02:55:19 +01:00
Melanie
43751d0cfd
Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge
2011-10-25 02:55:14 +01:00
Melanie
7ac9463e35
Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge
2011-10-25 02:55:01 +01:00
Melanie
0cbba1da8d
Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge
2011-10-25 02:54:41 +01:00
Melanie
dc24ac4f20
Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge
2011-10-25 02:54:34 +01:00
Melanie
51fd5bac5e
Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmerge
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2011-10-25 02:54:24 +01:00
Melanie
b7237ef059
Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 02:35:33 +01:00
Melanie
5c09cffe55
Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge
2011-10-25 02:27:35 +01:00
Melanie
496c647ab5
Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge
2011-10-25 02:27:26 +01:00
Melanie
e2de57ca29
Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 02:26:56 +01:00
Melanie
f6ea36b4fa
Fix a missing locking call
2011-10-25 03:15:28 +02:00
Melanie
4215aea036
Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge
2011-10-25 02:15:13 +01:00
Melanie
57b51287ae
Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge
2011-10-25 02:15:06 +01:00
Melanie
f387e84e51
Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge
2011-10-25 02:15:01 +01:00
Melanie
353f0c0e03
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 02:14:39 +01:00
Melanie
585f1b189f
Merge
2011-10-25 02:08:43 +01:00
Melanie
f50538c81a
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-25 01:55:01 +01:00
Melanie
3cdea11e29
Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge
2011-10-25 01:54:07 +01:00
Melanie
8841b77cd1
Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge
2011-10-25 01:53:53 +01:00
Melanie
9dd7d9c16c
Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge
2011-10-25 01:53:24 +01:00
Melanie
28d2103439
Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge
2011-10-25 01:53:02 +01:00
Melanie
e43e1b49db
Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge
2011-10-25 01:52:54 +01:00
Melanie
077e3500b2
Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmerge
2011-10-25 01:52:42 +01:00
Melanie
a09e72c8cc
Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmerge
2011-10-25 01:52:26 +01:00
Melanie
63cbdb9b2a
Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge
2011-10-25 01:52:19 +01:00
Melanie
f4e4026a7a
Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmerge
2011-10-25 01:51:49 +01:00
Melanie
fe014a05ac
Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmerge
2011-10-25 01:51:37 +01:00
Melanie
2895789bd0
Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge
2011-10-25 01:51:24 +01:00
Melanie
24e260744a
Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge
2011-10-25 01:51:06 +01:00
Melanie
69b480770a
Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:50:55 +01:00
Melanie
b4395143e7
Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 01:50:07 +01:00
Melanie
0a65e7cadc
Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmerge
2011-10-25 01:47:38 +01:00
Melanie
be3939358b
Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 01:47:35 +01:00
Melanie
506769c6a2
Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmerge
2011-10-25 01:43:27 +01:00
Melanie
53caaa8236
Merge commit 'ceb326284e49f0817fa0f848136ff60e6f66568f' into bigmerge
2011-10-25 01:43:12 +01:00
Melanie
747786aac0
Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge
2011-10-25 01:43:05 +01:00
Melanie
d68b73bfba
Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge
2011-10-25 01:42:56 +01:00
Melanie
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
Melanie
9ceb98344a
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
2011-10-25 01:37:11 +01:00
Melanie
13d635d1d7
Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge
2011-10-25 01:37:01 +01:00
Melanie
8e69dde397
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:36:39 +01:00
Melanie
0b833c458a
Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge
2011-10-25 01:35:51 +01:00
Melanie
080a41e9f9
Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge
2011-10-25 01:35:30 +01:00
Melanie
5f025d20fe
Fix ground sit autopilot
2011-10-25 00:53:39 +02:00
Justin Clark-Casey (justincc)
e14cb45b9b
Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()
...
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
2011-10-24 23:26:41 +01:00
Justin Clark-Casey (justincc)
9ec672c70b
Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler
...
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-24 23:16:03 +01:00
Justin Clark-Casey (justincc)
79d5bc9beb
separate out future common setup code from EventQueueTests.AddForClient()
2011-10-24 22:29:13 +01:00
Justin Clark-Casey (justincc)
e28e2d24c7
Add new EventQueueTests with basic test to check that adding a client registers an http poll
2011-10-24 22:23:41 +01:00
Justin Clark-Casey (justincc)
4c9400e646
Add optional getauthinfo and setauthinfo authentication service calls.
...
These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default)
These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
2011-10-24 21:40:36 +01:00
Melanie
4a6160e7ad
Fake an AgentCircuitData if none is available rather than crashing out
2011-10-24 18:22:36 +02:00
Justin Clark-Casey (justincc)
b868328d51
Comment out the uuid gatherer lines that I accidentally left in.
2011-10-23 03:14:32 +01:00
Pixel Tomsen
c2272a755f
Fix missing Busy-Mode Response
...
http://opensimulator.org/mantis/view.php?id=5748
2011-10-22 13:17:07 -04:00
BlueWall
3fc47275cf
Add case to Lightshare/Windlight
...
Thanks thomax for a patch to add handling for Sun/Moon pos.
2011-10-22 13:06:34 -04:00
Justin Clark-Casey (justincc)
ffdf59a57c
Get UUIDGatherer to scan notecards in the graph for asset uuids.
...
This is to support npc baked texture saving in oars and iars.
May address http://opensimulator.org/mantis/view.php?id=5743
2011-10-22 02:16:46 +01:00
Justin Clark-Casey (justincc)
30320505fa
redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we can comment out some inconsistency
2011-10-22 00:58:56 +01:00
Justin Clark-Casey (justincc)
bc2da4eaad
correct misleading method doc on CreateNotecardAsset()
2011-10-22 00:55:50 +01:00
Justin Clark-Casey (justincc)
c4f8da7359
in AssetHelpers, store the actual text passed in to the method, not the string "data"
2011-10-22 00:45:47 +01:00
Justin Clark-Casey (justincc)
5d7eaedbeb
encode notecard assets in proper format for tests, rather than just using whatever string is given
2011-10-22 00:21:45 +01:00
Justin Clark-Casey (justincc)
9b3bbedeea
refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAsset()
2011-10-22 00:13:46 +01:00
Michelle Argus
a1f05a289d
RemoteAdmin - Added optional terrain loading on region create using parameter heightmap_file to specify the terrain file to be loaded
2011-10-21 23:12:01 +01:00
Melanie
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
Justin Clark-Casey (justincc)
4241ee5dfa
very minor removal of old commented out line of code in OdeScene
2011-10-21 00:04:36 +01:00
Melanie
fd0e65b0b1
Fix up the animator and ScenePresence to like each other again
2011-10-20 23:11:53 +02:00
Justin Clark-Casey (justincc)
30fe66d3ab
remove unnecessary null check on _collisionEventPrim
2011-10-20 20:58:29 +01:00
Justin Clark-Casey (justincc)
9c43020876
Get OdeScene to use passed in time step rather than hard-coded 0.089
...
However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
2011-10-20 20:48:51 +01:00
Justin Clark-Casey (justincc)
6837e44d07
Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime)
...
SinceLastFrame was calculating the interval between any sleep that had occurred to pad out the frame time and the start of the next frame.
This would usually be below MinFrameTime but occasionally if the sleep was long it would be above, often due to the time required to update the watchdog.
This doesn't appear to play much practical role right now.
ODE was actually ignoring it entirely. Bullet might be helped slightly by receiving a non-varying value.
2011-10-20 19:44:59 +01:00
Justin Clark-Casey (justincc)
b63ec987b0
For now, stop passing timeStep into methods where it's not actually used.
2011-10-20 17:54:32 +01:00
Justin Clark-Casey (justincc)
f16d125027
Change wording on asset requests.
...
Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text.
2011-10-19 23:56:17 +01:00
Dan Lake
9ab2943abf
Removed redundant NotInTransit function from ScenePresence. IsInTransit=false does the same thing and NotInTransit was not used anywhere.
2011-10-19 15:50:09 -07:00
Dan Lake
eac29396d9
Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line endings from previous commit.
2011-10-19 15:38:25 -07:00
Dan Lake
8b20faf06c
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-19 14:43:16 -07:00
Dan Lake
da794f34a5
Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of scene presence by client ID.
2011-10-19 14:41:44 -07:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
f836710af5
minor: improve command help on scripts suspend/resume
2011-10-19 21:34:55 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
116fbe8258
add current script status to "scripts show" command (running, suspended, etc.)
2011-10-19 20:24:07 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
fe484ab331
Slightly change log message in LoadRegionsPlugin
2011-10-19 01:22:07 +01:00
Pixel Tomsen
178b8d0926
Region-UUID - can not be zero-uuid
...
http://opensimulator.org/mantis/view.php?id=3426
2011-10-19 01:19:21 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
9f171041c9
Make PrincipalID a synonym for UserID in GetUserAccount
2011-10-19 00:23:06 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
581885da75
Temporarily put in log lines to record time taken to set terrain in OdeScene.
2011-10-18 21:21:15 +01:00
Justin Clark-Casey (justincc)
03202ada29
Store scene identifier passed in to OdeScene for later debug messages
2011-10-18 21:11:13 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
5515c45e3b
minor: method doc to explain a lock of OdeLock
2011-10-18 20:56:11 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
aeb4ff0274
Allow an avatar to be explicitly named to the "debug packet" command
2011-10-17 20:58:23 +01:00
Justin Clark-Casey (justincc)
120114e96b
refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter without a getter
2011-10-17 20:50:29 +01:00
Justin Clark-Casey (justincc)
96ff2c63ed
Add avatar names to debug packet output
2011-10-17 20:37:01 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
de161585c0
Implement osNpcStand(<npc-id>)
...
Allows you to stand an NPC that has sat.
2011-10-17 01:56:25 +01:00
Justin Clark-Casey (justincc)
ddcb88ff53
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-17 01:45:41 +01:00
Justin Clark-Casey (justincc)
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
Diva Canto
730460169f
Bug fix on the bug fix on UserAccountService.cs
2011-10-16 16:13:24 -07:00
Diva Canto
bbd0e68c06
Guard HGAssetService against uninitialized variables and null arguments.
2011-10-15 20:23:26 -07:00
Justin Clark-Casey (justincc)
b9930a6305
improve method doc on Scene.OtherRegionUp()
...
this is really just to trigger panda.
2011-10-15 03:17:58 +01:00
Justin Clark-Casey (justincc)
ddf54b5537
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
2011-10-15 03:03:05 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
5ddefc2564
remove now redundant m_physical_prim flag from SOP.ApplyPhysics()
2011-10-15 02:47:27 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
f2889d7ce9
remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its done immediately afterwards in DoPhysicsPropertyUpdate()
2011-10-15 02:12:46 +01:00
Justin Clark-Casey (justincc)
732e937379
refactor: Remove redundant code in SOP.UpdatePrimFlags()
2011-10-15 02:07:05 +01:00
Justin Clark-Casey (justincc)
c93c9ea072
factor common code out into SOP.RemoveFromPhysics()
2011-10-15 02:02:39 +01:00
Justin Clark-Casey (justincc)
978fb3d482
reduce access to ODECharacter methods to make code analysis easier. Eliminate redundant argument on ProcessTaints()
2011-10-15 01:41:39 +01:00
Justin Clark-Casey (justincc)
9cc2694776
restrict unnecessary access levels on ODEPrim fields/properties
2011-10-15 01:31:09 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Diva Canto
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
77c65951e0
Extract NullPhysicsScene from PhysicsScene to improve code readability
2011-10-14 01:38:14 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
fd274a6688
refactor: chain the two scene constructors together to eliminate more copypasta
2011-10-13 22:21:03 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
ceb326284e
Move fps stat adjustment factor into field rather than hard-coded.
2011-10-13 21:55:51 +01:00
Justin Clark-Casey (justincc)
20da04fd0c
More method doc and formatting changes. Makes DestroyOdeStructures() private
2011-10-13 21:42:24 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
f08664f422
remove some mono compiler warnings
2011-10-12 21:54:25 +01:00
Justin Clark-Casey (justincc)
631d5e16ef
Get rid of some traces of the old pre-ROBUST grid architecture config
2011-10-12 21:51:34 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
36e73dbc9b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-12 19:24:03 +01:00
Justin Clark-Casey (justincc)
f9ffd2538f
Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection
2011-10-12 19:22:30 +01:00
Melanie
35def547f7
Merge branch 'master' into bigmerge
2011-10-12 16:45:48 +01:00
Melanie
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
Melanie
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
Melanie
d2dc2316c2
Merge branch 'master' into bigmerge
2011-10-12 09:26:35 +01:00
Melanie
1d379a9c7b
Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken
2011-10-12 07:46:13 +02:00
Melanie
e3effc4974
Merge branch 'master' into bigmerge
2011-10-12 07:29:35 +01:00
Melanie
4b069d23d0
Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge
2011-10-12 07:24:53 +01:00
Melanie
816d0de11a
Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge
2011-10-12 07:24:46 +01:00
Melanie
628ca122b8
Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmerge
2011-10-12 07:24:34 +01:00
Melanie
de109797f2
Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge
2011-10-12 07:24:26 +01:00
Melanie
cc637b78fb
Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge
2011-10-12 07:24:13 +01:00
Melanie
ad46ad1ab2
Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge
2011-10-12 07:23:54 +01:00
Melanie
98ae98510c
Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge
2011-10-12 07:23:40 +01:00
Melanie
5d3acc9ac3
Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge
2011-10-12 07:23:32 +01:00
Melanie
b716d98e23
Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmerge
2011-10-12 07:23:18 +01:00
Melanie
3657cd436c
Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge
2011-10-12 07:23:08 +01:00
Melanie
cc4b1c69d8
Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge
2011-10-12 07:23:02 +01:00
Melanie
3a290e581a
Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge
...
Conflicts:
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
2011-10-12 07:09:41 +01:00
Melanie
2c23fc9e68
Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge
2011-10-12 07:09:04 +01:00
Melanie
d03d486dbb
Merge commit 'ff80113534182bbcbcb49a73035776134fb04e3e' into bigmerge
2011-10-12 07:08:46 +01:00
Melanie
2f6cc77154
Adjust CM version tag
2011-10-12 07:08:23 +01:00
Melanie
336f6f7ec4
Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge
2011-10-12 07:07:37 +01:00
Melanie
492a50d6f7
Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmerge
2011-10-12 07:06:59 +01:00
Melanie
e18a76f6d6
Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge
2011-10-12 07:05:57 +01:00
Melanie
00285082d8
Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge
2011-10-12 07:05:47 +01:00
Melanie
abfb0c9399
Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge
2011-10-12 07:05:18 +01:00
Melanie
b251423b11
Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge
2011-10-12 07:04:28 +01:00
Melanie
86e28724bd
Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmerge
2011-10-12 07:03:58 +01:00
Melanie
265e9d094d
Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge
2011-10-12 07:02:36 +01:00
Melanie
b2090e711f
Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-12 07:02:15 +01:00
Melanie
f4de1a6d9b
HACK: Remove advanced property resending until it is fixed properly in core.
2011-10-12 06:48:40 +02:00
Melanie
9733b64dc8
Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-12 02:02:46 +01:00
Melanie
ba978d0d77
Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge
2011-10-12 01:43:52 +01:00
Melanie
4e88fe42e4
Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge
2011-10-12 01:42:39 +01:00
Melanie
5f2cb7caa3
Merge commit '7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7' into bigmerge
2011-10-12 01:42:30 +01:00
Melanie
77f9d98831
Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge
2011-10-12 01:41:59 +01:00
Melanie
d595f9fd85
Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmerge
2011-10-12 01:41:52 +01:00
Melanie
b0ee174296
Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge
2011-10-12 01:41:44 +01:00
Melanie
e68226afd3
Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge
2011-10-12 01:41:28 +01:00
Melanie
c0555f6be6
Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge
2011-10-12 01:39:38 +01:00
Melanie
f5e78ca616
Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmerge
...
Conflicts:
OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
2011-10-12 01:31:34 +01:00
Melanie
6af388ded9
Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge
2011-10-12 01:30:14 +01:00
Melanie
30b2fc6aea
Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge
2011-10-12 01:29:47 +01:00
Melanie
59e3ac1ec6
Fix rezzing coalesced object broken by core merge
2011-10-12 00:50:13 +02:00
Melanie
1c2b5d99c9
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-10-12 00:10:15 +02:00
Melanie
e4f3ba8610
Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
2011-10-12 00:10:30 +01:00
Melanie
a9af618842
Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-11 23:32:16 +01:00
Melanie
0b96991ab4
Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge
2011-10-11 23:28:16 +01:00
Melanie
b8e22b25fd
Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
2011-10-11 23:28:06 +01:00
Melanie
1ca86114e1
Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge
2011-10-11 23:22:23 +01:00
Melanie
3359bafc3e
Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge
2011-10-11 23:22:08 +01:00
Melanie
1b3ea64fe9
Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-11 23:21:36 +01:00
Melanie
ef9a811ea6
Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
2011-10-11 23:17:47 +01:00
Melanie
7891433148
Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge
2011-10-11 23:16:43 +01:00
Melanie
0ae63d0e8b
Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge
...
Conflicts:
OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
2011-10-11 23:16:19 +01:00
Melanie
efaa113fb9
Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmerge
2011-10-11 23:15:41 +01:00
Melanie
95a1a804bf
Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge
2011-10-11 23:15:29 +01:00
Melanie
ae67eb0a1f
Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge
2011-10-11 23:15:17 +01:00
Melanie
d1e681f682
Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2011-10-11 23:14:23 +01:00
Melanie
61a8e35b7d
Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge
2011-10-11 23:08:38 +01:00
Melanie
b9826035f6
Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge
2011-10-11 23:08:18 +01:00
Melanie
a157fdedcf
Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-11 23:08:07 +01:00
Melanie
66c06c5685
Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge
2011-10-11 23:02:19 +01:00
Melanie
ea8350a526
Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge
2011-10-11 23:02:04 +01:00
Melanie
5536cdf90c
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
2011-10-11 23:01:52 +01:00
Melanie
ed1bb2081e
Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge
2011-10-11 22:54:03 +01:00
Melanie
308b6937ad
Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge
2011-10-11 22:53:53 +01:00
Melanie
83ec064868
Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-11 22:53:27 +01:00
Melanie
b40157fc9b
Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
2011-10-11 22:51:44 +01:00
Melanie
75fd256ef8
Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge
2011-10-11 22:43:27 +01:00
Melanie
833420e167
Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge
2011-10-11 22:42:51 +01:00
Melanie
652c59c0a9
Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge
2011-10-11 22:42:18 +01:00
Melanie
2e47d24832
Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-11 22:41:51 +01:00
Melanie
a671fcfd2c
Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmerge
2011-10-11 22:33:58 +01:00
Melanie
6101de2316
Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-11 22:32:10 +01:00
Melanie
9935eb6578
Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge
2011-10-11 22:26:18 +01:00
Melanie
6e6c70be15
Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge
2011-10-11 22:24:40 +01:00
Melanie
1ba53850b2
Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge
2011-10-11 22:23:40 +01:00
Melanie
34954172a1
Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge
2011-10-11 22:23:16 +01:00
Melanie
b9de3b7f5b
Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge
...
Conflicts:
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
prebuild.xml
2011-10-11 22:22:34 +01:00
Justin Clark-Casey (justincc)
fe3594c5ea
Start recording object updates per second statistic (analogue of agent updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor
...
A useful diagnostic to find out how object updates are burdening a scene
2011-10-11 22:17:05 +01:00
Melanie
03d533dc1e
Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge
2011-10-11 22:15:25 +01:00
Melanie
341efb0942
Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge
2011-10-11 22:12:25 +01:00
Melanie
68a42af30f
Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge
2011-10-11 22:11:55 +01:00
Melanie
6978ae0a59
Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-11 22:11:44 +01:00
Melanie
a8747b3888
Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge
2011-10-11 21:41:30 +01:00
Melanie
f1fa059b37
Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge
2011-10-11 21:32:24 +01:00
Melanie
3ac15c03b2
Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge
2011-10-11 21:32:14 +01:00
Melanie
0fa21b7b5e
Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge
2011-10-11 21:31:48 +01:00
Melanie
673886d231
Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge
2011-10-11 21:30:42 +01:00
Melanie
986a3838a6
Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge
2011-10-11 21:29:58 +01:00
Melanie
5b40389352
Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge
2011-10-11 21:29:04 +01:00
Melanie
8fac7c0650
Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
2011-10-11 21:28:23 +01:00
Melanie
9d22110c23
Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge
2011-10-11 21:22:58 +01:00
Melanie
cc1fe354d0
Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 21:21:44 +01:00
Melanie
c95c8ab246
Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 21:06:06 +01:00
Melanie
7d2a3dc174
Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 20:57:31 +01:00
Justin Clark-Casey (justincc)
f138a2056e
meaningless change to goose panda
2011-10-11 00:29:41 +01:00
Pixel Tomsen
28f549bd64
osSetParcelDetails - PARCEL_DETAILS_CLAIMDATE
...
this new flag set parcels claim date
value 0 for this flag set current unixstamp
http://opensimulator.org/mantis/view.php?id=5725
2011-10-11 00:13:26 +01:00
Justin Clark-Casey (justincc)
353e7ce873
Allow monitoring of stats by region name
2011-10-10 23:58:27 +01:00
Justin Clark-Casey (justincc)
62aad4c18f
Add other region stats (total frame time, physics fps, etc.) currently missing from MonitorModule
...
Unlike the other 3 stats mechanisms, monitor data can be queried per individual region, which makes this useful.
This doesn't affect an of the existing monitored stats.
2011-10-10 23:48:53 +01:00
Justin Clark-Casey (justincc)
19096bd391
Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter
2011-10-10 22:23:42 +01:00
Justin Clark-Casey (justincc)
8114f895c2
Provide a way to turn the MonitorModule on and off
...
Default is currently on since this is the historical setting
2011-10-10 22:17:29 +01:00
Justin Clark-Casey (justincc)
2b290793ab
refactor: have lsl and ossl interrogate scene.StatsReporter directly rather than going through scene
...
I know this goes against the law of demeter but I don't think it's that useful here and I'd rather get rid of nasty little wrapper methods
2011-10-10 21:54:08 +01:00
Justin Clark-Casey (justincc)
013bf2775f
remove unused LastAssetID from DynamicTextureUpdaer
2011-10-10 15:19:23 +01:00
Justin Clark-Casey (justincc)
156385f48b
Tweak to language of last commit in rejecting UUID.Zero in GridService.RegisterRegion()
...
Allowing regions with UUID.Zero causes problems elsewhere according to http://opensimulator.org/mantis/view.php?id=3426
It's probably a bad idea to allow these in any case.
2011-10-08 02:15:04 +01:00
Pixel Tomsen
a6c5e00c45
GridService - Region UUID can not be NULL
...
http://opensimulator.org/mantis/view.php?id=3426
2011-10-08 02:13:18 +01:00
Justin Clark-Casey (justincc)
29660fe175
Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() check on XMLRPC RemoteAdmin handlers.
...
If admin is disabled then the XMLRPC handlers are never registered, which means that they cannot be called anyway.
2011-10-08 02:00:36 +01:00
Justin Clark-Casey (justincc)
71d29decc8
replace List used by m_accessIP in RemoteAdminPlugin with the more efficient HashSet
2011-10-08 01:53:10 +01:00
Justin Clark-Casey (justincc)
4073cd6ced
Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.
...
Also adds password check to some functions where this was missing and fixes some parameter checking.
This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me.
Thanks Michelle Argus.
2011-10-08 01:23:26 +01:00
Justin Clark-Casey (justincc)
ff80113534
Go back to lying that sim fps is 55 when it's actually locked at a maximum of 11.
...
We're been lying since 2008 so I'm sure another few years can't hurt.
To know the real fps, either divide sim fps by 5 and/or look at the frame time.
2011-10-08 00:15:15 +01:00
Justin Clark-Casey (justincc)
f8c06c6114
flip master version up to 0.7.3
2011-10-07 23:41:55 +01:00
BlueWall
1c54817977
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-07 16:36:43 -04:00
BlueWall
a9b3ab0c85
Add note to docs
...
This method is used by externasl/3rd party management tools to
create users and they depend on us to generate the UUID.
2011-10-07 16:34:33 -04:00
Justin Clark-Casey (justincc)
e3c522e211
Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log message
...
As per earlier discussions with dslake
2011-10-07 20:51:26 +01:00
Dan Lake
4b46b7a5ad
Fixed line endings from previous commit
2011-10-06 23:20:51 -07:00
Dan Lake
f26a966b8e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-06 22:50:03 -07:00
Dan Lake
4748c19bdb
Refactored "known child region" in ScenePresence. There were 4 different
...
ways to access the list/dictionary of child regions and locking was
inconsistent. There are now public properties which enforce locks.
Callers are no longer required to create new copies of lists.
2011-10-06 22:47:33 -07:00
Justin Clark-Casey (justincc)
1f78dc6504
remove the pointless slashes on the end of the (5!) different server stat retrieval mechanisms.
...
Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/
Can't do this with webstats yet since it does insane things to the path.
2011-10-07 00:30:35 +01:00
Justin Clark-Casey (justincc)
4c812884be
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-06 23:47:41 +01:00
Pixel Tomsen
95910f03d4
WebStats - Home Link Fix
...
http://opensimulator.org/mantis/view.php?id=4536
2011-10-06 22:30:24 +01:00
Dan Lake
9a16e76f51
Simplified IsInTransit property on ScenePresence and removed InTransit() which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit().
2011-10-06 12:39:19 -07:00
Dan Lake
08f264d096
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-06 12:22:15 -07:00
Dan Lake
bd9ba904c3
Refactor ScenePresence so gets and sets are through properties. Added private sets when needed. Removed redundant code when methods replicated what the set already does
2011-10-06 12:19:31 -07:00
Melanie
9500415c61
Merge branch 'careminster-presence-refactor' into bigmerge
2011-10-06 17:57:28 +02:00
Melanie
300d357573
Fix physics proxy position when linking and rotating the root prim only
2011-10-06 17:55:20 +02:00
Melanie
363a99593d
Change the asset connector to allow connection to different asset servers
...
depending on the first two digits of the asset id.
2011-10-06 15:39:21 +02:00
BlueWall
77b8fb0f86
Added back UserAccount that creates random UUID for new account.
...
This should fix recent issues with 3rd party apps that use the
old interface w/o breaking the new one.
2011-10-05 22:01:12 -04:00
Justin Clark-Casey (justincc)
ca83f99332
Instead of adding stat agentMS in all kinds of places, calculate it instead in the main Scene.Update() loop, like the other stats
...
Some of the places where agentMS was added were in separate threads launched by the update loop. I don't believe this is correct, since such threads are no longer contributing to frame time.
Some of the places were also driven by client input rather than the scene loop. I don't believe it's appropriate to add this kind of stuff to scene loop stats.
These changes hopefully have the nice affect of making the broken out frame stats actually add up to the total frame time
2011-10-06 00:45:25 +01:00
Justin Clark-Casey (justincc)
7fa1c979cf
rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not a single one
2011-10-05 23:36:27 +01:00
Justin Clark-Casey (justincc)
8a8983b3d4
Add user ID to new estate user prompt, to make it clearer and consistent with the main create user prompts
2011-10-05 23:34:18 +01:00
Justin Clark-Casey (justincc)
604708fc96
Change WebStatsModule to check its config properly, instead of catching the ineviable NullReferenceException!
...
Also, tidy up spacing.
2011-10-05 23:31:53 +01:00
Justin Clark-Casey (justincc)
9090039324
Remove unused local variable i from OdeScene.Simulate()
2011-10-05 22:15:28 +01:00
Justin Clark-Casey (justincc)
7d033187d8
Make reported sim fps more accurate, in line with frame time ms
...
Also remove some unused fields and improve naming on others.
2011-10-05 22:08:56 +01:00
Dan Lake
3142982353
Removed redundant scene presence lookups in HGMessageTransferModule
2011-10-05 12:58:24 -07:00
Dan Lake
38d205502a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 16:59:35 -07:00
Dan Lake
146322eb34
Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree objects already triggers objectkill packet to client. No need to send again.
2011-10-04 16:59:05 -07:00
Justin Clark-Casey (justincc)
9a49b3b519
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 23:53:30 +01:00
Justin Clark-Casey (justincc)
b907a66f39
When creating a new user on the comand line, give the option of allowing a UUID to be specified to override the randomly generated one.
...
This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership.
2011-10-04 23:48:35 +01:00
Mic Bowman
413e299045
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 15:44:22 -07:00
Mic Bowman
b229a72a5f
Turn off keepalives when commands are specified
2011-10-04 15:43:41 -07:00
Dan Lake
92c88121c7
Removed all refs to IClientAPI from IAttachmentsModule. Separated client handlers for attachments to call public interface and rearranged module file into sections
2011-10-04 14:40:39 -07:00
Dan Lake
bfa405e6f7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-03 16:45:04 -07:00
Dan Lake
460946ad62
Removed redundant code in AttachmentsModule and simplified interfaces which converted back and forth between ScenePresence and IClientAPI. More to be done still.
2011-10-03 16:44:32 -07:00
Justin Clark-Casey (justincc)
c7d0d71666
trival tweak to trigger the continuous integration system
2011-10-04 00:37:02 +01:00
Pixel Tomsen
b98442dcec
Animation-States Turning Left, Turning Right implemented/enabled
...
http://opensimulator.org/mantis/view.php?id=3036
2011-10-04 00:27:11 +01:00
Justin Clark-Casey (justincc)
a8af0a5ba8
Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather than ""
...
As per http://wiki.secondlife.com/wiki/LlGetTexture
2011-10-04 00:15:48 +01:00
Justin Clark-Casey (justincc)
8a6e6866d9
For llGetTexture(), if the face texture asset is in the inventory, return the inventory name rather than the asset UUID
...
This is as per http://wiki.secondlife.com/wiki/LlGetTexture
Applied patch in http://opensimulator.org/mantis/view.php?id=4552 with an additional break statement if an inventory item is found to exit early.
Thanks Michelle Argus!
2011-10-04 00:07:52 +01:00
Justin Clark-Casey (justincc)
34026887fe
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-03 23:26:52 +01:00
Justin Clark-Casey (justincc)
37ae6451f9
Remove vestigal RegionStatus.SlaveScene.
...
This appears to be code clutter since the code that uses this has long gone.
2011-10-03 23:25:09 +01:00
Dan Lake
e77c919290
Remove usage of Linden packet types from inside Attachments Module and interface
2011-10-03 11:55:54 -07:00
Justin Clark-Casey (justincc)
56dbab35e1
Remove unimplementated UpdateMovement() methods from SOG, SOP.
...
SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase.
No point making the code more complex until it actually needs to be,
2011-10-01 01:26:50 +01:00
Justin Clark-Casey (justincc)
42fe774ad1
Remove OpenSim.Region.Examples.SimpleModule
...
This module is more than 2 years old and at least some of the 'example' code it gives is now misleading.
Even the logs say it say some bits were broken where it was put in!
2011-10-01 01:21:20 +01:00
Pixel Tomsen
c7db3df344
llGetLinkKey, llGetLinkName Fix for sitting Avatar
...
when an avatar sits on a prim, we get now his key & name ;-)
http://opensimulator.org/mantis/view.php?id=4476
2011-10-01 00:41:47 +01:00
Justin Clark-Casey (justincc)
a1875ec760
Add ability to pass in the permissions option (perm) to save oar via RemoteAdmin
...
Applies patch in http://opensimulator.org/mantis/view.php?id=5686
Thanks Michelle Argus!
2011-10-01 00:19:09 +01:00
Justin Clark-Casey (justincc)
246443773a
minor: remove clutter null check from pass in config to AvatarFactoryModule.Initialize()
...
This is never null
2011-10-01 00:15:30 +01:00
Justin Clark-Casey (justincc)
e742cffe15
Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.
...
This is for debugging purposes. Defaults to Attachments Enabled
2011-09-30 01:19:22 +01:00
Pixel Tomsen
528fcede6c
llAvatarOnLinkSitTarget Implementation
...
http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
2011-09-29 01:08:05 +01:00
Justin Clark-Casey (justincc)
a3531dec1a
Add en_US culture setting to the async delete to inventory thread, to avoid any issues with float serialization with machines set to non en_US locales.
...
Doing this to see if addresses inventory object deserialization problems in http://opensimulator.org/mantis/view.php?id=5708 , though if it does I'm really surprised not to have seen it before now.
Really need to go through and systematically set the culture for every timer and change all BeginInvoke calls to FireAndForget instead.
But don't want to do something like that this close to a release.
2011-09-26 23:00:16 +01:00
Snoopy Pfeffer
2b2580e3a1
Fix for rezzing and derezzing HUDs (see Mantis #5406 ). From now on updates are only sent to affected clients.
2011-09-25 00:51:43 +02:00
Justin Clark-Casey (justincc)
8caf3ed49e
Remove the unimplented "clear assets" command.
...
This was a bizarre relic of a bygone age that had no implementations.
If you're using and want to clear the flotsam asset cache then please use the existing "fcache clear" command
2011-09-24 02:22:47 +01:00
Kevin Houlihan
e789ab659c
Removed uncalled region load method.
...
The method LoadRegionsPlugin.LoadRegionFromConfig was no longer being referenced from anywhere, so I removed it. It's function has apparently been taken on by the PostInitialise of that module.
2011-09-24 02:06:34 +01:00
Kevin Houlihan & Michelle Argus
39d7945efc
Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.
...
I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
2011-09-24 01:59:02 +01:00