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)
74cc834fec
Remove unused PumaCode.SvnDotNet library
2011-10-31 21:37:35 +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)
9bdf118e0d
Add missing max_listens_per_region to [LL_Functions] config section in OpenSimDefaults.ini + explanation.
...
This setting controls the maximum number of listeners in a region
2011-10-29 02:45:50 +01: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