Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| * | refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to ↵ | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -2/+2 |
| | | | | | | | | | | | | reflect what it actually does This also makes it consistent with some other methods that send data to the client. | ||||
* | | First set of merge fixes | Tom | 2011-09-07 | 1 | -1/+1 |
| | | |||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -67/+112 |
|\ \ | |/ | |||||
| * | Remove pointless cluttering SOP.ParentGroup != null checks. | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -5/+2 |
| | | | | | | | | | | The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database. At all other times it's not possible for a SOP not to have a SOG parent. | ||||
| * | Fix a bug where the non-root parts of rezzed objects that had previously ↵ | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | been attachments were sending their old attachment values to the client. The root part state is the canonical value, so always send that instead. Sending conflicting attachments states for non-root parts of a rezzed object is enough to crash the client. Fixes http://opensimulator.org/mantis/view.php?id=5664. Many thanks to mewtwo0641 for some fantastic qa work on this one. | ||||
| * | refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid ↵ | Justin Clark-Casey (justincc) | 2011-08-27 | 1 | -3/+7 |
| | | | | | | | | pointless duplication of identical values | ||||
| * | Don't try to save changed attachment states when an NPC with attachments is ↵ | Justin Clark-Casey (justincc) | 2011-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | removed from the scene. This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc. This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects | ||||
| * | early code to allow scripts to force npcs not to fly when moving to target | Justin Clark-Casey (justincc) | 2011-08-10 | 1 | -3/+3 |
| | | | | | | | | | | this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path. currently implemented in osNpcMoveToTarget(), but none of this is final. | ||||
| * | Stop trying to deregister caps or close child agents when an NPC is removed | Justin Clark-Casey (justincc) | 2011-08-10 | 1 | -1/+1 |
| | | |||||
| * | When an NPC is created, stop telling neighbouring regions to expect a child ↵ | Justin Clark-Casey (justincc) | 2011-08-09 | 1 | -3/+3 |
| | | | | | | | | agent | ||||
| * | get rid of vestigal move to parameters | Justin Clark-Casey (justincc) | 2011-08-03 | 1 | -30/+14 |
| | | |||||
| * | Partially fix autopilot/go here | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -45/+34 |
| | | | | | | | | | | | | | | This now works again except that it requires a click or avatar mvmt to get going This is because the ScenePresence.HandleAgentUpdate() method doesn't trigger until the client does something significant, at which point autopilot takes over. Even clicking is enough to trigger. This will be improved presently. | ||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -3/+4 |
| | | |||||
| * | Ensure that packet headers get parsed correctly | Melanie | 2011-07-27 | 1 | -0/+29 |
| | | |||||
| * | Fix LLTextBox to work with the updated libOMV | Melanie | 2011-07-23 | 1 | -1/+6 |
| | | |||||
| * | comment out all kinds of debugging guff | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -5/+5 |
| | | |||||
| * | Stop undo of just the root prim position in the linkset from shifting the ↵ | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -5/+5 |
| | | | | | | | | | | | | whole linkset. However, what happens now is that undo just doesn't do anything when the root prim is selected on its own. This requires more code than just fiddling with undo states. | ||||
| * | fix undo when resizing of non-root individual prims in a linkset | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -0/+5 |
| | | | | | | | | undo resize, rotation and position still needs fixing when only editing root prim of a linkset | ||||
| * | Fix undo for resizing linksets | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -12/+25 |
| | | | | | | | | | | | | This involves implementing a boolean in UndoState to signal whether the undo needs to be done for an entire group/linkset or just a single prim Resizing individual components of linksets is still dodgy. Resizing still has to be down twice, since for some reason the client is sending two multiobjectupdate packets on every resize except the very first. This applies to single prims and linksets. Need to look into this. |