| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 1 | -58/+20 |
| |\ | |||||
| | * | 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' into careminster | Melanie | 2011-12-14 | 5 | -17/+12 |
| |\ \ | |/ | |||||
| | * | 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. | ||||
| | * | 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 |
| | | | |||||
| * | | 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 | 9 | -242/+129 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 9 | -242/+129 |
| | |\ \ | | |/ | | | | | | | | | | | | | 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 | 6 | -50/+57 |
| | | | | | | | | | | | | | IsColliding | ||||
| | | * | 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! | ||||
| * | | | 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 | 2 | -14/+7 |
| | | | |||||
| * | | 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 | -0/+14 |
| |\ \ | |/ | |||||
| | * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 3 | -0/+14 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 7 | -90/+49 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | ||||
| | * | 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 |
| | | | |||||
| | * | 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 | 5 | -44/+9 |
| | | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 4 | -12/+13 |
| |\ \ | |/ | |||||
| | * | 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 | 1 | -0/+2 |
| | | | | | | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost | ||||
| * | | Restore the Avination way of position and angle calculation so resizers | Melanie | 2011-12-09 | 1 | -5/+2 |
| | | | | | | | | | work again. | ||||
| * | | Fix llGetLinkKey to report avatars properly | Melanie | 2011-12-09 | 1 | -19/+0 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 7 | -255/+284 |
| |\ \ | |/ | |||||
| | * | 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 | 3 | -109/+138 |
| | | | | | | | | | 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 | 3 | -16/+9 |
| | | | | | | | | | | | 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 | 9 | -95/+117 |
| |\ \ | |/ | | | | | | | 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 | 9 | -73/+85 |
| | | | | | | | | | | | | | | | | | | | 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 branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-12-08 | 7 | -57/+67 |
| |\ \ | |||||
| | * \ | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 7 | -57/+67 |
| | |\ \ | | |/ | | | | | | | | | | 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 | ||||
| | | * | 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 |
| | | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |