Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 1 | -0/+1 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| * | Add JsonTestStore to determine if a JsonStore is associated with | Mic Bowman | 2013-01-30 | 1 | -0/+1 |
| | | | | | | | | a particular UUID. | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-01-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | Add Refresh() Method to ISerachModule to allow forcing a sim to resend it's | Melanie | 2013-01-15 | 1 | -1/+1 |
| | | | | | | | | | | | | search data | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-11 | 1 | -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-10 | 1 | -0/+43 |
| | | | | | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings | ||||
* | | | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | * This finishes the implementation of AgentCachedTexture. Requires the ↵ | teravus | 2012-12-29 | 1 | -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 careminster | Melanie | 2013-01-06 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | * Partial Commit for Avatar Appearance to include the functionality of ↵ | teravus | 2012-12-21 | 1 | -2/+4 |
| | | | | | | | | | | | | Cached Bakes. | ||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-12-21 | 1 | -0/+19 |
|\ \ \ | |/ / | |||||
| * | | Add the interfaces for the new Avination baked texture cache service | Melanie | 2012-12-19 | 1 | -0/+19 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-04 | 1 | -0/+1 |
|\ \ \ | |/ / |/| / | |/ | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | ||||
| * | XmlRpcGridRouter | BlueWall | 2012-12-03 | 1 | -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 careminster | Melanie | 2012-11-12 | 1 | -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 interface | Melanie | 2012-11-12 | 1 | -55/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 1 | -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 formatting | SignpostMarv | 2012-11-11 | 1 | -36/+78 |
| | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 1 | -0/+33 |
|\ \ | |/ | |||||
| * | moving windlight-sources to correct namespace-named folder (world); add ↵ | PixelTomsen | 2012-11-11 | 1 | -0/+33 |
| | | | | | | | | | | | | LightShare as Interface Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 4 | -59/+104 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | ||||
| * | One more module converted: CloudModule. | Diva Canto | 2012-11-10 | 1 | -1/+1 |
| | | |||||
| * | 80 character-width terminal formatting of IDialogModule interface, removing ↵ | SignpostMarv | 2012-11-10 | 1 | -23/+28 |
| | | | | | | | | superfluous whitespace & line-endings. | ||||
| * | Documenting parameters of methods on the IDialogModule interface | SignpostMarv | 2012-11-10 | 1 | -33/+73 |
| | | |||||
| * | Converted the WindModule to the new region module interface (38 to go). Also ↵ | Diva Canto | 2012-11-09 | 1 | -1/+1 |
| | | | | | | | | added both the WindModule and the SunModule to the Plugin manifest. | ||||
| * | Converted the SunModule to the new region module interface. (39 to go...) | Diva Canto | 2012-11-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | marking IRegionModule interface as obsolete via System.ObsoleteAttribute, ↵ | SignpostMarv | 2012-11-09 | 1 | -0/+2 |
| | | | | | | | | intentionally triggering a bunch of warnings in compiler output in hopes of encouraging other developers to refactor built-in modules when they have free time. | ||||
| * | Add a method to query all registered script constants to allow non-XEngine | Melanie | 2012-11-04 | 1 | -0/+2 |
| | | | | | | | | script engines to use them. | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-11-04 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | Add a method to query all registered script constants to allow non-XEngine | Melanie | 2012-11-04 | 1 | -0/+2 |
| | | | | | | | | | | | | script engines to use them. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 1 | -0/+13 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| * | | Make "show object part" command correctly display script status. | Justin Clark-Casey (justincc) | 2012-10-31 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-30 | 1 | -3/+90 |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | documenting some params on ISoundModule methods | SignpostMarv | 2012-10-29 | 1 | -7/+16 |
| | | | |||||
| * | | Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the ↵ | SignpostMarv | 2012-10-29 | 1 | -0/+3 |
| | | | | | | | | | | | | LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint | ||||
| * | | shuffling code around so that the interface for ISoundModule.SendSound() ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | specifies a UUID rather than a string | ||||
| * | | moving SendSound from SceneObjectPart to ISoundModule | SignpostMarv | 2012-10-29 | 1 | -0/+15 |
| | | | |||||
| * | | deduplicating code into a single LoopSound method | SignpostMarv | 2012-10-29 | 1 | -4/+5 |
| | | | |||||
| * | | adjusting parameter order of PreloadSound to be more logical | SignpostMarv | 2012-10-29 | 1 | -2/+2 |
| | | | |||||
| * | | transposing LoopSoundMaster to Sound Module | SignpostMarv | 2012-10-29 | 1 | -0/+11 |
| | | | |||||
| * | | transposing preload sound onto sound module | SignpostMarv | 2012-10-29 | 1 | -0/+10 |
| | | | |||||
| * | | transposing stop sound into sound module | SignpostMarv | 2012-10-29 | 1 | -0/+6 |
| | | | |||||
| * | | documenting ISoundModule methods & fields | SignpostMarv | 2012-10-29 | 1 | -0/+28 |
| | | | |||||
| * | | formatting ISoundModule prior to documentation | SignpostMarv | 2012-10-29 | 1 | -2/+4 |
| | | | |||||
| * | | stripping whitespace from ISoundModule, formatting SoundModuleNonShared.cs | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | | |||||
| * | | making the max distance for sounds to be heard from their origin a ↵ | SignpostMarv | 2012-10-29 | 1 | -0/+2 |
| | | | | | | | | | | | | configurable option exposed via a public field on ISoundModule (with private setter in the implementation) | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -1/+25 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | ||||
| * | | refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field ↵ | SignpostMarv | 2012-10-26 | 1 | -2/+1 |
| | | | | | | | | | | | | with a private setter | ||||
| * | | adding ability for listeners to be filtered by regular expressions and a ↵ | SignpostMarv | 2012-10-26 | 1 | -0/+25 |
| | | | | | | | | | | | | general-purpose function to see if a given string matches a given regex |