Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 1 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts) | ||||
* | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | minor: correct text and usage for "image queues show" reigon console command. | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 2 | -15/+66 |
|\ \ | |/ | |||||
| * | Telehub Support: | BlueWall | 2012-01-20 | 1 | -0/+6 |
| | | | | | | | | 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. | ||||
| * | Add "image queues clear <first-name> <last-name>" console command | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -15/+60 |
| | | | | | | | | This allows a way to manually clear pending image queue requests for debug purposes | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | minor: Fix wrong column length in image queues report | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -19/+85 |
|\ \ | |/ | |||||
| * | rename "show image queue" to "show image queues" in line with other udp info ↵ | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -29/+8 |
| | | | | | | | | | | | | commands. Eliminate redundant one line methods | ||||
| * | Add "show image queue <first-name> <last-name>" region console command | Justin Clark-Casey (justincc) | 2012-01-10 | 1 | -1/+88 |
| | | | | | | | | This is so that we can inspect the image download queue (texture download via udp) for debugging purposes. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -0/+155 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | ||||
| * | Improve "j2k decode" command to tell us how many layers and components were ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -3/+13 |
| | | | | | | | | decoded, instead of just success/failure | ||||
| * | Add a "j2k decode" region console command that allows a manual request for a ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -0/+145 |
| | | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -3/+3 |
|\ \ | |/ | | | | | | | 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 | -3/+3 |
| | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -3/+5 |
|\ \ | |/ | | | | | | | 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 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -1/+1 |
| | | | | | | | | packet per prim. More to come as we change to make use of this. | ||||
* | | Implement ChangeInventoryItemFlagsPacket handling | Melanie | 2011-12-04 | 1 | -0/+1 |
| | | |||||
* | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+1 |
|\ \ | |/ | |||||
| * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -4/+1 |
| | | | | | | | | without a getter | ||||
* | | 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 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -1/+1 |
| | | | | | | | | This is moved into ScenePresence for now as a general facility | ||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | 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 | -1/+1 |
| | | | | | | | | | | 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. | ||||
| * | When an NPC is created, stop telling neighbouring regions to expect a child ↵ | Justin Clark-Casey (justincc) | 2011-08-09 | 1 | -2/+2 |
| | | | | | | | | agent | ||||
| * | get rid of vestigal move to parameters | Justin Clark-Casey (justincc) | 2011-08-03 | 1 | -1/+1 |
| | | |||||
| * | Fix LLTextBox to work with the updated libOMV | Melanie | 2011-07-23 | 1 | -1/+1 |
| | | |||||
* | | Fix LLTextBox to work with the updated libOMV | Melanie | 2011-07-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fill in the new OwnerData field in the LLUDP ScriptDialog message. | Justin Clark-Casey (justincc) | 2011-05-31 | 1 | -1/+1 |
| | | | | | | | | | | If we don't do this then viewer 2.8 crashes. Resolves http://opensimulator.org/mantis/view.php?id=5510 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -3/+2 |
|\ \ | |/ | |||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -1/+1 |
| | | |||||
| * | add descriptive explanations for region restart functionality | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -1/+0 |
| | | |||||
| * | fix command display for debugging 'emergency-monitoring' | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'queuetest' into careminster-presence-refactor | Melanie | 2011-04-25 | 1 | -11/+110 |
|\ \ | |/ | |||||
| * | Cleaned up various configuration options. Removed the category throttle | Mic Bowman | 2011-04-25 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | limits because the only ones used now are the defaults (which are overwritten by the client throttles anyway). Updated the default rates to correspond to about 350kbps. Also added a configuration to disable adaptive throttle. The default is the previous behavior (no adaptation). | ||||
| * | Various clean ups. Removed some debugging code. Added a new "show pqueues" | Mic Bowman | 2011-04-22 | 1 | -2/+101 |
| | | | | | | | | | | | | command to look at the entity update priority queue. Added a "name" parameter to show queues, show pqueues and show throttles to look at data for a specific user. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 1 | -3/+2 |
|\ \ | |/ | |||||
| * | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code. | ||||
* | | Fix up client implementations | Melanie | 2011-04-17 | 1 | -1/+1 |
| | |