aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-032-4/+11
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-151-4/+6
| | | | | | | | Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
| * Made terrain uploads thread-safeOren Hurvitz2013-10-151-0/+5
| |
* | Merge branch 'master' into careminsterMelanie2013-08-011-0/+48
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-311-0/+48
| | | | | | | | | | | | | | cap is something other than "localhost". A new interface for handling external caps is supported with an example implemented for Simian. The only linden cap supporting this interface right now is the GetTexture cap.
* | Merge branch 'master' into careminsterMelanie2013-07-292-1/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that ↵Diva Canto2013-07-281-0/+2
| | | | | | | | handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
| * Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-271-1/+1
| | | | | | | | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
* | Merge branch 'master' into careminsterMelanie2013-07-241-0/+19
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Improvements to the ServiceThrottleModule: added a category and an itemid to ↵Diva Canto2013-07-161-1/+9
| | | | | | | | the interface, so that duplicate requests aren't enqueued more than once.
| * Added IServiceThrottleModule.csDiva Canto2013-07-161-0/+11
| |
* | Merge branch 'avination-current' into careminsterMelanie2013-06-062-0/+53
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | 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-05-241-1/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Implement llSetSoundQueueing().Justin Clark-Casey (justincc)2013-05-221-1/+7
| | | | | | | | | | | | | | | | | | This is controlled by the viewer, not the server. So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim. You probably need to use llPreloadSound() for best results
* | | Merge branch 'master' into careminsterMelanie2013-05-081-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Step 2: commit the IEstateModuleInterface changes neededMelanie2013-05-071-1/+2
| | |
| * | Step one of estate settings sharing - port the Avination Estate module ↵Melanie2013-05-071-1/+1
| | | | | | | | | | | | (complete module) as changes are too extensive to apply manually
* | | Merge branch 'master' into careminsterMelanie2013-04-251-0/+57
|\ \ \ | |/ / | | / | |/ |/|
| * Adding the dynamic menu module which allows registering new menu options in ↵Melanie2013-04-251-0/+57
| | | | | | | | compliant viewers
| * Fix bug where outstanding llHTTPRequests for scripts were not being aborted ↵Justin Clark-Casey (justincc)2013-04-041-1/+7
| | | | | | | | | | | | | | | | | | when they were deleted. This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID. This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself. This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
* | 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
| | |
generated by cgit v1.1 at 2025-03-10 02:39:47 +0000