ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 09:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,653 Commits 5 Branches 96 Tags
3b2900e88415e3dc7826df3e8685415134676dcc
Commit Graph

2780 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
937c06db54 Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter 
Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly.
Add commented out log lines for future use.
Use automatic property for PhysicsActor for better code readability and simplicity
 2011-12-15 21:57:22 +00:00
Melanie
898549d13e Merge branch 'master' into careminster 2011-12-14 08:57:55 +00:00
Dan Lake
f43e5f92fd Just adding a comment to SendFullUpdatToClient 2011-12-13 23:34:59 -08:00
Dan Lake
39736e52d8 Reorder clearing of upate schedule on SOP to before sending updates. Fix potential race condition. 2011-12-13 21:37:17 -08:00
Melanie
6d1d1c0dbf Comment debug spam 2011-12-13 00:36:44 +01:00
Melanie
d18a9f22e7 Prevent a nasty deadlock on teleport 2011-12-12 23:43:45 +01:00
Melanie
8418288e26 Make m_attachments private 2011-12-12 18:29:54 +01:00
Melanie
afab4b276e Remove spammy log messages when querying sim health 2011-12-12 13:51:31 +01:00
Dan Lake
c34ab0ee66 Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsColliding 2011-12-12 02:43:38 -08:00
Melanie
95d533ce8a Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2011-12-12 11:09:13 +01:00
Melanie
52a4dbccbe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-12-12 11:42:22 +00:00
Melanie
943b37b8e6 Send changed animation event asynchronously 2011-12-12 11:08:50 +01:00
Melanie
323ffd7a89 Fix a regression that causes data from the attachments module to fail loading 2011-12-10 15:28:32 +01:00
Melanie
db98698bbe Prevent spurious error message when client tries to move a null item 2011-12-10 14:47:00 +01:00
Melanie
3f42183797 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
 2011-12-10 00:40:41 +00:00
Justin Clark-Casey (justincc)
13b1c8c173 Do some clean up Scene.cs log messages. 
This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows.
This also uses m_log.*Format() which is more efficient than string concat.
 2011-12-09 23:21:54 +00:00
Justin Clark-Casey (justincc)
af3cd00048 Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead. 2011-12-09 23:07:53 +00:00
Melanie
5f6a4c4111 Merge branch 'master' into careminster 2011-12-09 22:55:08 +00:00
Justin Clark-Casey (justincc)
fc27806e90 remove some unused fields in ScenePresence 2011-12-09 22:52:54 +00:00
Justin Clark-Casey (justincc)
94c242f792 Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that it doesn't trigger an exception if the item hasn't been found. 
In this situation we will now put out a slightly more meaningful log error message instead.
 2011-12-09 22:36:51 +00:00
Melanie
00b36eb0fe Restore the Avination way of position and angle calculation so resizers 
work again.
 2011-12-09 20:55:48 +01:00
Melanie
d913303875 Merge branch 'master' into bigmerge 2011-12-09 08:13:57 +00:00
Justin Clark-Casey (justincc)
0e265889dd Remove unnecessary AgentCircuitData null check from Scene.AddNewClient(). 
The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists.
This allows us to eliminate another null check elsewhere and simplifies the method contract
 2011-12-08 19:25:24 +00:00
Justin Clark-Casey (justincc)
55de189752 minor: remove some mono compiler warnings 2011-12-08 18:56:07 +00:00
Justin Clark-Casey (justincc)
54360dd20e When a client connects to a scene, send other avatar appearance data asynchronously to reduce hold up in the IN UDP packet processing loop. 
This is already being done for the initial object data send.
 2011-12-08 18:39:56 +00:00
Justin Clark-Casey (justincc)
f61e54892f On a new client circuit, send the initial reply ack to let the client know it's live before sending other data. 
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
 2011-12-08 18:34:23 +00:00
Melanie
96539ffc79 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-12-08 18:29:19 +00:00
Justin Clark-Casey (justincc)
355cde464a Simplify Scene.AddNewClient() 
If sp becomes null right after we've checked or created it, then behaviour down the line is going to be wrong anyway.
So instead retain the check/create ScenePresence reference and use this.
 2011-12-08 16:10:47 +00:00
Melanie
50aa89dae6 Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-12-08 03:24:25 +00:00
Justin Clark-Casey (justincc)
eda770e978 Remove unused SceneManager.TryGetAvatarsScene() 
It makes far more sense anyway to use TryGetRootScenePresence().Scene, in common with the rest of the code
This method could also return any scene for child or root agents, depending in which order the scenes happened to lie in the list
 2011-12-07 21:17:13 +00:00
Justin Clark-Casey (justincc)
3d95015686 On an Exception in Scene.RemoveClient(), always remove the client (and SP) structure so that logout on unexpired packets isn't retriggered, causing the same exception 2011-12-07 18:43:48 +00:00
Justin Clark-Casey (justincc)
415b7b7ec4 Implement XMLRPCAdmin command admin_teleport_agent. 
This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
 2011-12-07 17:31:57 +00:00
Melanie
5490a3e549 Fix phantom and temp flags not taking 2011-12-06 19:44:45 +01:00
Justin Clark-Casey (justincc)
af9ccfa15c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-12-05 20:50:44 +00:00
Justin Clark-Casey (justincc)
4567555c49 Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse. 
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
 2011-12-05 20:44:20 +00:00
Melanie
bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +00:00
Melanie
66f4ce354f Fix CHANGED_TEXTURE and CHANGED_COLOR. 2011-12-05 19:01:14 +00:00
Melanie
6362df1202 Serialize the Volume Detect field 2011-12-05 19:33:25 +01:00
Melanie
cc482ee865 Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge 2011-12-05 18:54:31 +00:00
Melanie
2a8a46a32d Fix CHANGED_TEXTURE and CHANGED_COLOR. 2011-12-05 18:32:40 +01:00
Melanie
5ab536a1e9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-12-05 17:10:51 +00:00
Melanie
35800d6a86 Reinstate setter for OffsetPosition to allow setting the offset by script 
while seated
 2011-12-05 15:26:22 +01:00
Melanie
19d6aa2bc9 Don't allow position update on sitting avatar. Don't bounds check sitting 
avatars as they will be crossed by the vehicle and not individually
 2011-12-04 20:16:07 +01:00
Justin Clark-Casey (justincc)
a82aea53f8 Split up test SceneHelpers to provide an AddChildScenePresence() call 2011-12-03 19:32:59 +00:00
Justin Clark-Casey (justincc)
a4d82895be Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() since they don't do anything useful. 2011-12-03 19:14:37 +00:00
Justin Clark-Casey (justincc)
3852f05e6e Extend TestCreateChildScenePresence to make assertions both at CreateAgent stage and then at Scene.AddClient() 2011-12-03 19:10:32 +00:00
Justin Clark-Casey (justincc)
4919c60560 Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() 
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
 2011-12-03 18:59:54 +00:00
Justin Clark-Casey (justincc)
c934901a05 Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions 2011-12-03 16:11:47 +00:00
Justin Clark-Casey (justincc)
aac3f2d04e Add agent circuit number checks to TestCloseAgent() 2011-12-03 16:04:11 +00:00
Justin Clark-Casey (justincc)
aba42d8543 Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7 
We are returning the actual number of 'sides', not the maximum index number.
Also minor format corrections.
 2011-12-03 15:54:06 +00:00