Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | HG minor bug fix and marked one method obsolete in UAS. | Diva Canto | 2011-12-16 | 3 | -1/+6 |
| | |||||
* | Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter ↵ | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -5/+0 |
| | | | | constructor | ||||
* | Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() ↵ | Justin Clark-Casey (justincc) | 2011-12-15 | 4 | -24/+27 |
| | | | | | | when we've already passed size information to the avatar at PhysicsScene.AddAvatar() Eliminate some copypasta for height setting in OdeCharacter | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -1/+1 |
|\ | |||||
| * | minor fix to MegaRegions, typo spotted by Ubit! | nebadon | 2011-12-15 | 1 | -1/+1 |
| | | |||||
* | | Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter | Justin Clark-Casey (justincc) | 2011-12-15 | 3 | -35/+56 |
|/ | | | | | | 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 | ||||
* | minor: add some currently commented log lines for use in debugging | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -1/+8 |
| | |||||
* | Simplify some manipulation of _taintedActors in OdeScene | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -13/+6 |
| | |||||
* | Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour ↵ | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -45/+14 |
| | | | | | | of just a _taintedPrims HashSet. There's no point maintaining a list because any pending taint operations are all carried out in the same call anyway. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 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. | ||||
* | | Fix off by one bug in objects GrabbingBehaviour of pCampBot.exe | Justin Clark-Casey (justincc) | 2011-12-14 | 2 | -2/+2 |
|/ | | | | Also fix usage message. | ||||
* | In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵ | Justin Clark-Casey (justincc) | 2011-12-13 | 2 | -4/+6 |
| | | | | | | | | in the same thread rather than on another one. The caller is already an async thread from LLClientView so this doesn't hold up the client. However, launching on a separate thread does remove the effect of m_setAppearanceLock This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all. | ||||
* | minor: remove pointless comment from OdeScene.cs | Justin Clark-Casey (justincc) | 2011-12-12 | 1 | -2/+1 |
| | |||||
* | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵ | Dan Lake | 2011-12-12 | 6 | -50/+57 |
| | | | | IsColliding | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-12-12 | 3 | -191/+72 |
|\ | |||||
| * | Mantis 5816: osParseJSON Decoding Problems | nebadon | 2011-12-11 | 3 | -191/+72 |
| | | | | | | | | | | | | | | osParseJSON uses hand-crafted decoding that has two issues * does not seem to handle top-level JSON lists * does not seem to handle unicode text thanks otakup0pe! | ||||
* | | Added an option for extra settings within region ini file. Any non-hardcoded ↵ | Dan Lake | 2011-12-12 | 1 | -20/+55 |
|/ | | | | key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo | ||||
* | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 5 | -0/+18 |
| | |||||
* | minor: remove a mono compiler warning | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | |||||
* | Print out one log message for every missing baked texture, rather than two. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -22/+4 |
| | |||||
* | minor: comment out "unpacked appearance" log mesasge for now | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | |||||
* | Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | |||||
* | 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 | 7 | -57/+16 |
| | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | ||||
* | remove some unused fields in ScenePresence | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+0 |
| | |||||
* | Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+5 |
| | |||||
* | 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. | ||||
* | Add commented log lines to FetchInventoryDescendents2 path for future use. | Justin Clark-Casey (justincc) | 2011-12-09 | 3 | -4/+95 |
| | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost | ||||
* | Revert "Revert "Stop performing the asset save part of baked texture ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -5/+9 |
| | | | | | | | | uploading on the UploadBakedTexture cap asynchronously."" This turned out not to be the upload texture issue. This reverts commit 8721841fc3944ce0cdf5ce76297e73f9ed269751. | ||||
* | Don't reply with an ack packet if the client is not authorized. | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -45/+31 |
| | |||||
* | Extend TestAddClient() to check that the first packet received is an ack packet | Justin Clark-Casey (justincc) | 2011-12-08 | 3 | -93/+116 |
| | |||||
* | Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -1/+1 |
| | |||||
* | Reactivate BasicCircuitTests.TestAddClient() | Justin Clark-Casey (justincc) | 2011-12-08 | 4 | -125/+167 |
| | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login. | ||||
* | Remove unnecessary AgentCircuitData null check from Scene.AddNewClient(). | Justin Clark-Casey (justincc) | 2011-12-08 | 4 | -19/+10 |
| | | | | | 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 |
| | |||||
* | 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 | 13 | -78/+171 |
| | | | | | | | | | 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. | ||||
* | Remove a left over log output | Melanie | 2011-12-08 | 1 | -2/+1 |
| | |||||
* | Remove warning in admin_save_oar xmlrpc method where noassets == true was ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -1/+1 |
| | | | | comparing against an object rather than a string | ||||
* | Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -2/+2 |
| | | | | success = true on success rather than false | ||||
* | Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -1711/+1370 |
| | | | | of code to do password checks, etc., instead of copy/pasting this code into every method | ||||
* | 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 | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -0/+1 |
|\ | |||||
| * | Trigger a Jenkins build | BlueWall | 2011-12-07 | 1 | -0/+1 |
| | | |||||
* | | Implement XMLRPCAdmin command admin_teleport_agent. | Justin Clark-Casey (justincc) | 2011-12-07 | 5 | -5/+157 |
|/ | | | | This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position. | ||||
* | properly lock CapsHandlers.m_capsHandlers | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -26/+40 |
| |