aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-161-2/+5
|\
| * protect the region ready alerts for loading oarfiles if no post URI is setMic Bowman2012-01-141-2/+5
| |
* | Merge branch 'master' into careminsterMelanie2012-01-141-6/+51
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Update RegionReadyModuleBlueWall2012-01-131-6/+51
| | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* | 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.
* | Merge branch 'master' into careminsterMelanie2012-01-121-2/+2
|\ \ | |/
| * minor: Fix wrong column length in image queues reportJustin Clark-Casey (justincc)2012-01-101-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-101-19/+85
|\ \ | |/
| * rename "show image queue" to "show image queues" in line with other udp info ↵Justin Clark-Casey (justincc)2012-01-101-29/+8
| | | | | | | | | | | | commands. Eliminate redundant one line methods
| * Add "show image queue <first-name> <last-name>" region console commandJustin Clark-Casey (justincc)2012-01-101-1/+88
| | | | | | | | This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
* | Merge branch 'master' into careminsterMelanie2012-01-101-0/+50
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add "app find <uuid-or-start-of-uuid>" command to find the appearance using ↵Justin Clark-Casey (justincc)2012-01-101-0/+50
| | | | | | | | | | | | a particular baked texture, if any. This is for debugging to relate texture console entries back to particular users on the simulator end.
| * 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 careminsterMelanie2012-01-064-7/+351
|\ \ | |/ | | | | | | 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-051-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-051-0/+145
| | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes.
| * Make "show asset" command available simulator side. Actually make the ↵Justin Clark-Casey (justincc)2012-01-051-0/+51
| | | | | | | | | | | | service command be "show asset" instead of "show digest" this time. Last time I accidnetally just changed the usage message.
| * Move simulator asset info commands to an optional module from the connector. ↵Justin Clark-Casey (justincc)2012-01-052-3/+136
| | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled.
| * Improve "app rebake" command to return a better message if no uploaded ↵Justin Clark-Casey (justincc)2012-01-051-4/+9
| | | | | | | | texture ids were available for the rebake request
* | Merge branch 'master' into careminsterMelanie2012-01-051-1/+39
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Add "appearance rebake" command to ask a specific viewer to rebake textures ↵Justin Clark-Casey (justincc)2012-01-041-1/+39
| | | | | | | | | | | | | | | | from the server end. This is not as useful as it sounds, since you can only request rebakes for texture IDs already received. In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect. Nonetheless, this is useful for diagnostic/debugging purposes.
* | Merge branch 'master' into careminsterMelanie2011-12-191-30/+0
|\ \ | |/
| * Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs ↵Justin Clark-Casey (justincc)2011-12-191-30/+0
| | | | | | | | as this is updating SOG/SOP.GroupID, which is arguably generic.
* | Merge branch 'master' into careminsterMelanie2011-12-191-33/+1
|\ \ | |/
| * Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-33/+1
| | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* | Merge branch 'master' into careminsterMelanie2011-12-182-12/+41
|\ \ | |/
| * Fix bug where objects couldn't be set back to the "none" group.Justin Clark-Casey (justincc)2011-12-171-8/+13
| | | | | | | | | | | | | | This is handled by treating UUID.Zero as a special case. Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case. It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately. This is a further component of http://opensimulator.org/mantis/view.php?id=5588
| * Fix bug where objects could not be set to a new group if the group had been ↵Justin Clark-Casey (justincc)2011-12-171-1/+26
| | | | | | | | | | | | | | | | | | | | created in that client session, or if no other action has been performed on the object. There were two problems here: 1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session 2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag. This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588 This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
| * Tunnel [GroupsModule] DebugEnabled setting down into ↵Justin Clark-Casey (justincc)2011-12-162-11/+10
| | | | | | | | XmlRpcGroupsServicesConnectorModule so that we can record cache misses
* | 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-102-0/+2
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-102-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2011-12-102-4/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
| * minor: remove a mono compiler warningJustin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵Justin Clark-Casey (justincc)2011-12-091-3/+3
| | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
* | Merge branch 'master' into bigmergeMelanie2011-12-082-4/+9
|\ \ | |/ | | | | | | 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-082-4/+9
| | | | | | | | | | | | | | | | | | 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-061-18/+128
|\ \ | |/
| * Make "show appearance" a synonym for "appearance show"Justin Clark-Casey (justincc)2011-12-061-2/+8
| |
| * In "appearance show", if a particular avatar is specified, print out texture ↵Justin Clark-Casey (justincc)2011-12-061-5/+35
| | | | | | | | UUID for each bake type and whether the simulator can find it.
| * Actually send the avatar data if an individual avatar is specified, rather ↵Justin Clark-Casey (justincc)2011-12-061-0/+2
| | | | | | | | than accidentally doing nothing
| * Allow "appearance show" command to take an optional avatar nameJustin Clark-Casey (justincc)2011-12-061-8/+40
| |
| * Make it possible to manually send appearance information via the "appearance ↵Justin Clark-Casey (justincc)2011-12-061-11/+42
| | | | | | | | send" command for a chosen avatar as well as all
| * Provide feedback as to which avatars are resending appearance informion on ↵Justin Clark-Casey (justincc)2011-12-061-2/+11
| | | | | | | | "appearance send" console command
* | Merge branch 'master' into bigmergeMelanie2011-12-053-7/+7
|\ \ | |/