aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Small adjustments to the floater moduleMelanie2013-05-131-1/+1
|
* Add RegionManager level and the ability to use literal XML to the dynamic ↵Melanie2013-05-042-0/+2
| | | | floater module
* Controller module for dynamic floaters (WIP)Melanie2013-04-271-0/+51
|
* Adding the dynamic menu module which allows registering new menu options in ↵Melanie2013-04-251-0/+57
| | | | compliant viewers
* Merge branch 'master' into careminsterMelanie2013-03-291-0/+3
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added missing functionality (mainly custom headers) to llHTTPRequest.Kevin Cozens2013-03-291-0/+3
| |
* | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-291-2/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * Stop attempts to update/add existing attachments in user inventory when ↵Justin Clark-Casey (justincc)2013-03-281-2/+4
| | | | | | | | | | | | teleporting between regions. This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
* | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-291-0/+4
|\ \ | |/
| * If the viewer has already rezzed any attachments itself, then ignore the ↵Justin Clark-Casey (justincc)2013-03-281-0/+4
| | | | | | | | | | | | simulator-side rez attachments call. This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
| * Merge branch 'master' into newmultiattachMelanie2013-03-181-1/+13
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Multiattach, part 1Melanie2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | Merge branch 'master' into careminsterMelanie2013-03-081-1/+13
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-051-1/+13
| |/ | | | | | | | | functions into one for node type and one for value type. Define and export constants for both nodes and values.
* | Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Multiattach, part 1Melanie2013-03-051-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-03-031-3/+5
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-3/+5
| | | | | | | | | | | | there was a handler for it.
* | | Merge branch 'master' into careminsterMelanie2013-02-271-0/+11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-0/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-221-1/+0
|\ \ \ | |/ /
| * | Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-191-1/+0
| | | | | | | | | | | | remove the deprecated TestPath functions.
* | | Merge branch 'master' into careminsterMelanie2013-02-151-2/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵Justin Clark-Casey (justincc)2013-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | JsonArrayLength() -> JsonGetArrayLength() This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-1/+5
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-141-1/+5
|\ \ \ | | |/ | |/|
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-1/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-141-0/+15
|\ \ \ | | |/ | |/|
| * | Adds a couple requested functions to the JsonStore scriptMic Bowman2013-02-131-0/+15
| | | | | | | | | | | | | | | | | | interface. JsonPathType returns the type of node pointed to by the path and deprecates the functionality of both JsonTestPath functions. JsonArrayLength returns the length of an array node.
| * | Plumb the path from the client to the extra physics params and backMelanie2013-02-071-0/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-071-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script functions. Adds JsonAttachObjectStore to associate a store identifier with an object (scripts can only access the store in their host object, this could be extended but isn't necessary for now). Note this opens a method to the DAMap OSDMap. This will be removed later, but greatly simplifies the code for now. The JsonStore and these scripts are disabled by default.
* | | Merge branch 'master' into careminsterMelanie2013-01-311-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | Add JsonTestStore to determine if a JsonStore is associated withMic Bowman2013-01-301-0/+1
| | | | | | | | | | | | a particular UUID.
* | | Merge branch 'avination' into careminsterMelanie2013-01-161-1/+1
|\ \ \ | | |/ | |/|
| * | Add Refresh() Method to ISerachModule to allow forcing a sim to resend it'sMelanie2013-01-151-1/+1
| | | | | | | | | | | | search data
* | | Merge branch 'master' into careminsterMelanie2013-01-111-0/+43
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-0/+43
| | | | | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
* | | Merge branch 'avination' into careminsterMelanie2013-01-101-2/+2
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-291-2/+2
| | | | | | | | | | | | XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
* | | Merge branch 'avination' into careminsterMelanie2013-01-061-2/+4
|\ \ \ | |/ /
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-2/+4
| | | | | | | | | | | | Cached Bakes.
* | | Merge branch 'avination' into careminsterMelanie2012-12-211-0/+19
|\ \ \ | |/ /
| * | Add the interfaces for the new Avination baked texture cache serviceMelanie2012-12-191-0/+19
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-041-0/+1
|\ \ \ | |/ / |/| / | |/ | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * XmlRpcGridRouterBlueWall2012-12-031-0/+1
| | | | | | | | | | | | | | | | | | Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called. See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or https://github.com/BlueWall/XmlRpcRouter for php gateway and test code.
* | Merge branch 'master' into careminsterMelanie2012-11-121-55/+0
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Completely remove the IRegionModule interfaceMelanie2012-11-121-55/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-121-36/+78
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * document & 80-character width terminal formattingSignpostMarv2012-11-111-36/+78
| | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
generated by cgit v1.1 at 2024-12-22 04:10:12 +0000