aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-02-151-0/+7
|\ \ | | | | | | | | | careminster
| * | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-141-0/+7
| | | | | | | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet.
* | | Merge branch 'master' into careminsterMelanie2012-02-151-0/+1
|\ \ \ | |/ / |/| / | |/
| * Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-141-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-02-101-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * If NPCModule.CreateNPC() fails to create the required ScenePresence (which ↵Justin Clark-Casey (justincc)2012-02-091-1/+1
| | | | | | | | should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
* | Merge branch 'master' into careminsterMelanie2012-02-011-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix copy/paste errorsMelanie2012-02-011-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-281-1/+33
|\ \ | |/
| * Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().Justin Clark-Casey (justincc)2012-01-281-1/+33
| | | | | | | | | | This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension). Wiki doc on this and other recent NPC functions will follow soon
* | Merge branch 'master' into careminsterMelanie2012-01-271-1/+1
|\ \ | |/
| * Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ↵Justin Clark-Casey (justincc)2012-01-271-1/+1
| | | | | | | | | | | | | | NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input key was not an npc. llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return. Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash.
* | Merge branch 'master' into careminsterMelanie2012-01-142-0/+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
| * Register the UrlModule for script engine events OnScriptRemoved and ↵Justin Clark-Casey (justincc)2012-01-141-0/+13
| | | | | | | | | | | | | | | | | | OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. Doing this in every script is unnecessary since the event trigger is parameterized by the item id. All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException. Registration moved to UrlModule so that the handler is registered for all script engine implementations. This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
| * Update RegionReadyModuleBlueWall2012-01-131-0/+38
| | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* | Merge branch 'master' into careminsterMelanie2012-01-131-3/+0
|\ \ | |/
| * Undo some prior workBlueWall2012-01-121-3/+0
| | | | | | | | Move some added fuctions out of core into the addon module to keep things clean
* | Merge branch 'master' into careminsterMelanie2012-01-132-0/+73
|\ \ | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-01-122-2/+10
| |\
| * | Move some interfaces to a more apropriate placeBlueWall2012-01-122-0/+73
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-122-2/+10
|\ \ \ | | |/ | |/|
| * | Add permissions checks for owned avatars to all other osNpc* functions.Justin Clark-Casey (justincc)2012-01-121-1/+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.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-121-1/+1
| |\ \
| | * | Renamed one var and deleted commented code. No functional changes.Diva Canto2012-01-121-1/+1
| | |/
| * | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() ↵Justin Clark-Casey (justincc)2012-01-121-0/+8
| |/ | | | | | | methods and expose on interface for external calls.
| * Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ↵Melanie2012-01-061-3/+10
| | | | | | | | 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-061-3/+10
| | | | | | | | 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-062-2/+22
|\ \ | |/ | | | | | | 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-0/+10
| | | | | | | | 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-1/+8
| | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes.
| * Improve "app rebake" command to return a better message if no uploaded ↵Justin Clark-Casey (justincc)2012-01-051-1/+4
| | | | | | | | texture ids were available for the rebake request
* | Merge branch 'master' into careminsterMelanie2012-01-052-0/+25
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Separate out rebake request code from cache validation code AvatarFactoryModule.Justin Clark-Casey (justincc)2012-01-041-0/+22
| | | | | | | | This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command).
| * Profile UpdatesBlueWall2012-01-031-0/+3
| | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
* | Merge branch 'master' into careminsterMelanie2012-01-021-0/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout ↵Diva Canto2011-12-291-0/+2
| | | | | | | | region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
* | Merge branch 'master' into careminsterMelanie2011-12-191-1/+10
|\ \ | |/
| * Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-1/+10
| | | | | | | | | | | | | | | | 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 bigmergeMelanie2011-12-081-21/+1
|\ \ | |/ | | | | | | 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-21/+1
| | | | | | | | | | | | | | | | | | 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-11-171-0/+11
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Add test for removing a friendship.Justin Clark-Casey (justincc)2011-11-141-0/+11
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-142-55/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs
| * Merge branch 'remove-scene-viewer'Dan Lake2011-11-141-50/+0
| |\
| | * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-111-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prim update to only triple queuing. Existing method was: 1. Schedule prim for update, adding to scene update list 2. Update on SOGs during heartbeat queues update onto each SceneViewer 3. Update on SPs during heartbeat queues update onto each IClientAPI 4. ProcessEntityUpdates queues updates into UDP send stack Now the SceneViewer has been eliminated so updates are scheduled at any time and then put onto the IClientAPI priority queues immediately during SceneGraph.UpdateObjectGroups.
| * | Improved method doc for AddFriend() - it actually does set up a two-way ↵Justin Clark-Casey (justincc)2011-11-141-5/+2
| | | | | | | | | | | | | | | | | | relationship. Rename IFriendsModule.AddFriend() to AddFriendship()
* | | Merge branch 'master' into bigmergeMelanie2011-11-141-0/+14
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * | Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-141-0/+14
| |/
* | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵Dan Lake2011-10-191-2/+2
| | | | | | | | endings from previous commit.