aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-071-1/+28
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * minor: Add missing license information from the top of IUserManagementJustin Clark-Casey (justincc)2012-10-051-1/+28
| |
* | Merge branch 'master' into careminsterMelanie2012-10-031-0/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-021-0/+9
| |
* | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-241-1/+1
| | | | | | | | | | | | simply process it as if UUID.Zero had been given.
* | | Merge branch 'master' into careminsterMelanie2012-09-171-1/+41
|\ \ \ | | |/ | |/|
| * | Documentation of IScriptModuleComms.RegisterConstant and ↵SignpostMarv2012-09-171-1/+18
| | | | | | | | | | | | | | | | | | IScriptModuleComms.LookupModConstant Signed-off-by: Melanie <melanie@t-data.com>
| * | Implementing ability to register script constants and invocations on a ↵SignpostMarv2012-09-171-0/+23
| | | | | | | | | | | | region module automatically
* | | Merge branch 'master' into careminsterMelanie2012-09-162-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Support multi-region OAR filesOren Hurvitz2012-09-141-0/+5
| | | | | | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
| * | Allow an incoming identifier to be specified for a JsonStore.Mic Bowman2012-09-111-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-2/+2
|\ \ \ | | |/ | |/|
| * | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-041-2/+2
| | | | | | | | | | | | it's own sub-method
* | | Merge branch 'master' into careminsterMelanie2012-09-071-3/+54
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | If reusing dynamic textures, do not reuse small data length textures that ↵Justin Clark-Casey (justincc)2012-09-061-3/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | fall below current viewer discard level 2 thresholds. Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache. This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request. This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
* | | Merge branch 'master' into careminsterMelanie2012-08-311-0/+29
|\ \ \ | |/ /
| * | adding support for static method script invocationsSignpostMarv2012-08-311-2/+9
| | |
| * | adding documentation to script invokation methodsSignpostMarv2012-08-311-0/+22
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-311-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | This partially implements the LSL function to set the responseMic Bowman2012-08-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | type for an HTTP request. Since the "official" LSL function limits the use of the response type, it is implemented as osSetContentType with a string for the content mime type and a threat level of high. With this function you should be able to implement rather functional media-on-a-prim application with much less difficulty.
* | | Merge branch 'master' into careminsterMelanie2012-08-291-2/+14
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * Add experimental DynamicTextureModule.ReuseTextures flag, currently only ↵Justin Clark-Casey (justincc)2012-08-281-1/+13
| | | | | | | | | | | | | | | | | | | | | | configurable on compile. Disabled (status quo) by default. This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours. This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web). This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures. A downside is that this stops expiry of old temporary dynamic textures from the cache, Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours.
| * Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). ↵Justin Clark-Casey (justincc)2012-08-281-1/+1
| | | | | | | | Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-152-0/+11
| |
| * Allow the use of the region debug console found in recent viewers. This consoleMelanie2012-08-141-0/+39
| | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console.
* | Make the console output from the reigon console hookableMelanie2012-08-181-0/+4
| |
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-152-0/+12
| |
* | Allow the use of the region debug console found in recent viewers. This consoleMelanie2012-08-141-0/+39
| | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console.
* | Merge branch 'master' into careminsterMelanie2012-08-141-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-141-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+4
|\ \ | |/
| * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-311-0/+4
| | | | | | | | constants to the script engine.
* | Merge branch 'master' into careminsterMelanie2012-07-281-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * Remove duplicated IScenePresence.PresenceType. This is already in ↵Justin Clark-Casey (justincc)2012-07-271-2/+0
| | | | | | | | | | | | ISceneAgent.PresenceType from which IScenePresence inherits. No other code changes required.
| * Change attachment handling to remove object from the scene first as perMelanie2012-07-232-2/+4
| | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | Merge branch 'avination' into careminsterMelanie2012-07-232-2/+4
|\ \
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-232-2/+4
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | | Merge branch 'master' into careminsterMelanie2012-07-191-1/+10
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Perform other region ready actions even if simulator is configured to leave ↵Justin Clark-Casey (justincc)2012-07-181-1/+10
| | | | | | | | logins disabled on startup.
* | Merge branch 'master' into careminsterMelanie2012-07-161-2/+0
|\ \ | |/
| * Revert "Fix script "Running" behavior"Melanie2012-07-161-2/+0
| | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80.
* | Merge branch 'master' into careminsterMelanie2012-07-121-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-111-1/+1
| | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
* | Merge branch 'master' into careminsterMelanie2012-07-112-2/+21
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * When an attachment is detached to inv or derezzed, stop the scripts, update ↵Justin Clark-Casey (justincc)2012-07-101-2/+13
| | | | | | | | | | | | the known item with script state still in the script engine and then remove the scripts. This is to fix a regression starting from 5301648 where attachments had to start being deleted before persistence in order to avoid race conditions with hud update threads.
| * Mantis 6063 osNpcTouch.Talun2012-07-061-0/+8
| | | | | | | | Allow NPCS to touch obects.
| * Add preservation of running state of scripts when drag-copying.Melanie2012-07-011-1/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-06-292-3/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG ↵Justin Clark-Casey (justincc)2012-06-282-3/+7
| | | | | | | | | | | | | | directly instead of an item ID to then shuffle through attachments, saving CPU busywork. Almost all callers already had the sog to hand. Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
generated by cgit v1.1 at 2024-10-21 05:36:35 +0000