aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-211-0/+5
|\
| * Telehub Support:BlueWall2012-01-201-0/+5
| | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
* | Merge branch 'master' into careminsterMelanie2012-01-122-16/+56
|\ \ | |/
| * Add remove test for unowned avatarsJustin Clark-Casey (justincc)2012-01-121-0/+20
| |
| * Add permissions checks for owned avatars to all other osNpc* functions.Justin Clark-Casey (justincc)2012-01-121-4/+1
| | | | | | | | This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like.
| * refactor: Move existing npc owner checks to NPCModule.CheckPermissions() ↵Justin Clark-Casey (justincc)2012-01-121-13/+36
| | | | | | | | methods and expose on interface for external calls.
| * Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵Melanie2012-01-063-11/+36
| | | | | | | | owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
* | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵Melanie2012-01-063-11/+36
| | | | | | | | owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
* | Merge branch 'master' into careminsterMelanie2011-12-121-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵Dan Lake2011-12-121-1/+1
| | | | | | | | IsColliding
* | Merge branch 'master' into careminsterMelanie2011-12-101-0/+1
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-101-0/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-081-1/+4
|\ \ | |/ | | | | | | 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-081-1/+4
| | | | | | | | | | | | | | | | | | 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
* | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-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.
| * Line endingsDan Lake2011-11-231-101/+101
| |
* | Implement ChangeInventoryItemFlagsPacket handlingMelanie2011-12-041-0/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-101-1/+3
|\ \ | |/
| * Correct test failure in sit position check of TestSitAndStandWithNoTarget()Justin Clark-Casey (justincc)2011-11-071-1/+3
| | | | | | | | | | | | Curiously, a Vector3.ToString() will not display the last two places of the float. In this case, the failure of the assertion would confusingly report Expected: <0, 0, 0.8454993> But was: <0, 0, 0.8454993> when actual Z figure is 0.845499337 Should fully address http://opensimulator.org/mantis/view.php?id=5779
* | Merge branch 'master' into bigmergeMelanie2011-11-071-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * That such a trivial change can be so difficult to get right. Fix it this time.Melanie2011-11-071-1/+1
| |
| * Fix build breakMelanie2011-11-071-1/+1
| |
| * Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
| |
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-1/+1
| | | | | | | | packet per prim. More to come as we change to make use of this.
* | Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-052-3/+40
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Fix NPC sitting for prims without a sit target.Justin Clark-Casey (justincc)2011-11-052-3/+40
| | | | | | | | | | | | | | | | This is to partially address http://opensimulator.org/mantis/view.php?id=5769 We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger. By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>. However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent). Hopefully this can be addressed soon.
* | Merge branch 'master' into bigmergeMelanie2011-10-262-1/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-252-1/+2
| | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
* | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * refactor: rename some AssetHelpers.CreateAsset() methods to ↵Justin Clark-Casey (justincc)2011-10-221-1/+1
| | | | | | | | CreateNotecardAsset()
* | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-252-2/+2
|\ \ | |/
| * Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵Dan Lake2011-10-192-2/+2
| | | | | | | | scene presence by client ID.
* | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmergeMelanie2011-10-251-3/+1
|\ \ | |/
| * refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵Justin Clark-Casey (justincc)2011-10-171-3/+1
| | | | | | | | without a getter
* | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmergeMelanie2011-10-252-2/+23
|\ \ | |/
| * Implement osNpcStand(<npc-id>)Justin Clark-Casey (justincc)2011-10-172-2/+23
| | | | | | | | Allows you to stand an NPC that has sat.
* | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-252-0/+42
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-172-0/+42
| | | | | | | | | | | | | | | | | | Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE) e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE); At the moment, sit only succeeds if the part has a sit target set. NPC immediately sits on the target even if miles away - they do not walk up to it. This method is in development - it may change so please don't trust it yet. Standing will follow shortly since that's kind of important once you're sitting :)
* | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵Justin Clark-Casey (justincc)2011-10-141-1/+1
| | | | | | | | sends entity updates (including presence ones), not just prims.
* | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmergeMelanie2011-10-121-10/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmergeMelanie2011-10-121-7/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
| * Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree ↵Dan Lake2011-10-041-14/+2
| | | | | | | | objects already triggers objectkill packet to client. No need to send again.
* | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-111-4/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Removed redundant code in AttachmentsModule and simplified interfaces which ↵Dan Lake2011-10-031-4/+2
| | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still.
* | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-112-75/+4
|\ \ | |/
| * Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-222-75/+4
| | | | | | | | This is moved into ScenePresence for now as a general facility
* | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
generated by cgit v1.1 at 2024-10-22 17:48:32 +0000