| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -0/+12 | |
| |\ \ | |/ | ||||||
| | * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 1 | -0/+12 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -12/+4 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||||
| | * | Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -12/+4 | |
| | | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 4 | -240/+278 | |
| |\ \ | |/ | ||||||
| | * | 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 | 1 | -4/+4 | |
| | | | | | | | | | | | 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 | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 3 | -21/+46 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | On a new client circuit, send the initial reply ack to let the client know ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 3 | -21/+46 | |
| | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Recover from an internal mess-up in the outgoing packet queues by creating | Melanie | 2011-12-08 | 1 | -19/+36 | |
| | | | | | | | | | a new queue object. | |||||
| * | | Implement ChangeInventoryItemFlagsPacket handling | Melanie | 2011-12-04 | 1 | -0/+16 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -7/+11 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||||
| | * | When setting packet level logging via "debug packet", apply to all clients, ↵ | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -7/+11 | |
| | | | | | | | | | | | | | not just root ones. Also adds scene name and client type (root|child) to logged information. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -0/+2 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||||
| | * | If a friends identifier which is too short is given to ↵ | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -0/+2 | |
| | | | | | | | | | | | | | HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring(). This is to progress http://opensimulator.org/mantis/view.php?id=5789 | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 1 | -26/+20 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||||
| | * | Restore sending of OutPacket() for object kills removed in commit c7dd7b1. | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -26/+20 | |
| | | | | | | | | | | | | | | | | | | | | | OutPacket() must be called within the m_killRecord lock. Otherwise the following event sequence is possible 1) LLClientView.ProcessEntityUpdates() passes the kill record check for a particular part suspends before OutPacket() 2) Another thread calls LLClientView.SendKillObject() to delete the same part and modifies the kill record 3) The same thread places the kill packet on the Task queue. 4) The earlier thread resumes and places the update packet on the Task queue after the kill packet. This results in a ghost part in the sim that only goes away after client relog. This commit also removes the unnecessary m_entityUpdates.SyncRoot locking in SendKillObject. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -21/+32 | |
| | | | | | | | | | packet per prim. More to come as we change to make use of this. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-30 | 1 | -2/+2 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | * | Stop setting _position as well as m_taint_position in ODECharacter.Position | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -2/+2 | |
| | | | | | | | | | | | 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 | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 1 | -1/+3 | |
| |\ \ | |/ | | | | | | | | | | | | | | | 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 | |||||
| | * | Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly ↵ | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -1/+3 | |
| | | | | | | | | | | | | | passed a null node reference. Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752 | |||||
| * | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 1 | -15/+10 | |
| |\ \ | |/ | ||||||
| | * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -15/+10 | |
| | | | | | | | | | without a getter | |||||
| * | | Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+17 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||||
| | * | Add avatar names to debug packet output | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵ | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -1/+1 | |
| | | | | | | | | | sends entity updates (including presence ones), not just prims. | |||||
| * | | Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+6 | |
| |\ \ | |/ | ||||||
| | * | More method doc and formatting changes. Makes DestroyOdeStructures() private | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -0/+6 | |
| | | | ||||||
| * | | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Get rid of some traces of the old pre-ROBUST grid architecture config | Justin Clark-Casey (justincc) | 2011-10-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge | Melanie | 2011-10-25 | 5 | -343/+282 | |
| |\ \ | |/ | ||||||
| | * | Bring LindenUDP.Tests back from the dead. No tests are running. | Justin Clark-Casey (justincc) | 2011-10-12 | 5 | -343/+282 | |
| | | | | | | | | | Code drift means that most of this stuff doesn't compile but the structure is still useful. | |||||
| * | | Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge | Melanie | 2011-10-25 | 3 | -3/+12 | |
| |\ \ | |/ | ||||||
| | * | minor: insert some commented out log lines which are a blunt but useful ↵ | Justin Clark-Casey (justincc) | 2011-10-12 | 3 | -3/+12 | |
| | | | | | | | | | instrument to see packet expiry and received acks | |||||
| * | | Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge | Melanie | 2011-10-25 | 3 | -17/+39 | |
| |\ \ | |/ | ||||||
| | * | Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection | Justin Clark-Casey (justincc) | 2011-10-12 | 3 | -17/+39 | |
| | | | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -3/+4 | |
| | |\ | ||||||
| * | | | HACK: Remove advanced property resending until it is fixed properly in core. | Melanie | 2011-10-12 | 1 | -10/+14 | |
| | | | | ||||||
| * | | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge | Melanie | 2011-10-11 | 1 | -15/+7 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -15/+7 | |
| | | | | | | | | | | | | | This appears to be code clutter since the code that uses this has long gone. | |||||
| * | | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+4 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||||
| | * | | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 1 | -3/+4 | |
| | |/ | ||||||
| * | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+3 | |
| |\ \ | |/ | ||||||
| | * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -3/+3 | |
| | | | | | | | | | This is moved into ScenePresence for now as a general facility | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |