Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -27/+32 | |
| | | | | | | | | | | | | 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 | |||||
* | | Fix hit testing link sets properly. Fix raycasting for LSL. | Melanie | 2011-12-17 | 1 | -6/+6 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 2 | -11/+5 | |
|\ \ | |/ | ||||||
| * | Just adding a comment to SendFullUpdatToClient | Dan Lake | 2011-12-13 | 1 | -0/+2 | |
| | | ||||||
| * | Reorder clearing of upate schedule on SOP to before sending updates. Fix ↵ | Dan Lake | 2011-12-13 | 1 | -11/+3 | |
| | | | | | | | | potential race condition. | |||||
* | | Comment debug spam | Melanie | 2011-12-13 | 1 | -1/+1 | |
| | | ||||||
* | | Prevent a nasty deadlock on teleport | Melanie | 2011-12-12 | 1 | -24/+22 | |
| | | ||||||
* | | Make m_attachments private | Melanie | 2011-12-12 | 1 | -1/+1 | |
| | | ||||||
* | | Remove spammy log messages when querying sim health | Melanie | 2011-12-12 | 1 | -2/+14 | |
| | | ||||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-12 | 4 | -47/+55 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 4 | -47/+55 | |
| |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵ | Dan Lake | 2011-12-12 | 4 | -46/+55 | |
| | | | | | | | | | | | | IsColliding | |||||
* | | | Send changed animation event asynchronously | Melanie | 2011-12-12 | 1 | -14/+17 | |
|/ / | ||||||
* | | Fix a regression that causes data from the attachments module to fail loading | Melanie | 2011-12-10 | 1 | -0/+1 | |
| | | ||||||
* | | Prevent spurious error message when client tries to move a null item | Melanie | 2011-12-10 | 2 | -119/+143 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 3 | -53/+40 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||||
| * | Do some clean up Scene.cs log messages. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -24/+38 | |
| | | | | | | | | | | 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. | |||||
| * | Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 3 | -29/+2 | |
| | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 2 | -8/+6 | |
|\ \ | |/ | ||||||
| * | remove some unused fields in ScenePresence | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+0 | |
| | | ||||||
| * | Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+6 | |
| | | | | | | | | | | | | 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. | |||||
* | | Restore the Avination way of position and angle calculation so resizers | Melanie | 2011-12-09 | 1 | -5/+2 | |
| | | | | | | | | work again. | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 3 | -15/+6 | |
|\ \ | |/ | ||||||
| * | Remove unnecessary AgentCircuitData null check from Scene.AddNewClient(). | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -12/+5 | |
| | | | | | | | | | | 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 | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -3/+1 | |
| | | ||||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 3 | -49/+61 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | When a client connects to a scene, send other avatar appearance data ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -6/+6 | |
| | | | | | | | | | | | | asynchronously to reduce hold up in the IN UDP packet processing loop. This is already being done for the initial object data send. | |||||
| * | On a new client circuit, send the initial reply ack to let the client know ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 3 | -27/+29 | |
| | | | | | | | | | | | | | | | | | | 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 | |||||
| * | Simplify Scene.AddNewClient() | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -17/+28 | |
| | | | | | | | | | | 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. | |||||
* | | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 3 | -39/+59 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | Remove unused SceneManager.TryGetAvatarsScene() | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -20/+0 | |
| | | | | | | | | | | 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 | |||||
| * | On an Exception in Scene.RemoveClient(), always remove the client (and SP) ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -19/+28 | |
| | | | | | | | | structure so that logout on unexpired packets isn't retriggered, causing the same exception | |||||
| * | Implement XMLRPCAdmin command admin_teleport_agent. | Justin Clark-Casey (justincc) | 2011-12-07 | 3 | -3/+42 | |
| | | | | | | | | This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position. | |||||
* | | Fix phantom and temp flags not taking | Melanie | 2011-12-06 | 2 | -2/+10 | |
| | | ||||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -40/+42 | |
| |\ | ||||||
| | * | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 1 | -40/+42 | |
| | | | ||||||
| * | | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -1/+1 | |
| |/ | | | | | | | | | | | | | | | 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. | |||||
* | | Serialize the Volume Detect field | Melanie | 2011-12-05 | 2 | -3/+9 | |
| | | ||||||
* | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2011-12-05 | 1 | -39/+40 | |
|\ \ | | | | | | | | | | into bigmerge | |||||
| * | | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 1 | -39/+40 | |
| | | | ||||||
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 5 | -145/+236 | |
|\ \ \ | |/ / |/| / | |/ | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | Split up test SceneHelpers to provide an AddChildScenePresence() call | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -0/+1 | |
| | | ||||||
| * | Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -70/+5 | |
| | | | | | | | | since they don't do anything useful. | |||||
| * | Extend TestCreateChildScenePresence to make assertions both at CreateAgent ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -0/+16 | |
| | | | | | | | | stage and then at Scene.AddClient() | |||||
| * | Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -11/+46 | |
| | | | | | | | | | | 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. | |||||
| * | Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -4/+2 | |
| | | | | | | | | dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions | |||||
| * | Add agent circuit number checks to TestCloseAgent() | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -0/+4 | |
| | | ||||||
| * | Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7 | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -7/+5 | |
| | | | | | | | | | | We are returning the actual number of 'sides', not the maximum index number. Also minor format corrections. | |||||
| * | Workaround for mesh to correct the number of faces in GetNumberOfSides(). ↵ | marc | 2011-12-03 | 1 | -1/+9 | |
| | | | | | | | | | | | | Meshs are handeled as sculpts but can have up to 8 faces (SL restriction the collada format can handle even more). The patch enables all LSL function that adressing faces to behave correct. Like llGetNumberOfSides(); llSetLinkPrimitiveParamsFast(); llSetPrimitiveParams(); llSetColor(); Signed-off-by: marc <mare@sounddog.net> |