aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-132-20/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Remove IClientIPEndpoint client interface for now.Justin Clark-Casey (justincc)2012-07-121-10/+1
| | | | | | | | | | This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor. Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
| * Remove IClientAPI.GetClientEP() in favour of existing identical ↵Justin Clark-Casey (justincc)2012-07-122-10/+0
| | | | | | | | IClientAPI.RemoteEndpoint.
* | Merge branch 'master' into careminsterMelanie2012-07-124-12/+6
|\ \ | |/ | | | | | | | | | | | | 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
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-114-12/+6
| | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
* | Merge branch 'master' into careminsterMelanie2012-07-113-2/+60
|\ \ | |/ | | | | | | | | | | | | | | 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
| * minor: rearrange INITIALIZATION COMPLETE log message so that it's clear init ↵Justin Clark-Casey (justincc)2012-07-071-3/+2
| | | | | | | | is only complete for a particular region at a time
| * minor: Get RegionReady module to shout initialization complete status to ↵Justin Clark-Casey (justincc)2012-07-071-1/+3
| | | | | | | | draw the eye
| * Mantis 6077 trim NPC chat on channel zero.Talun2012-07-061-0/+8
| | | | | | | | | | This patch trims leading and trailing spaces from NPC chat and suppresses the sending of empty chat strings on open chat channel 0.
| * Mantis 6063 osNpcTouch.Talun2012-07-062-0/+49
| | | | | | | | Allow NPCS to touch obects.
* | Merge branch 'master' into careminsterMelanie2012-07-051-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-051-2/+2
| | | | | | | | | | | | | | This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first. Still only attaches objects to the owner of the script. This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them. Threat level high.
* | Merge branch 'master' into careminsterMelanie2012-06-142-9/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-132-9/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-06-061-7/+8
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * Ensure closure of bitmap and memory stream with using() statements in ↵Justin Clark-Casey (justincc)2012-06-061-7/+8
| | | | | | | | | | | | WorldViewModule. If this has any effect then it will only be to the map images returned via requests to the /worldview simulator HTTP path (not enabled by default)
* | Merge branch 'master' into careminsterMelanie2012-05-271-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * refactor: Rename ConsoleTableRow and ConsoleTableColumn to ↵Justin Clark-Casey (justincc)2012-05-231-6/+6
| | | | | | | | ConsoleDisplayTableRow and ConsoleDisplayTableColumn
| * refactor: rename ConsoleTable -> ConsoleDisplayTable for clarityJustin Clark-Casey (justincc)2012-05-231-1/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-05-132-0/+2
|\ \
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-122-0/+2
| | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
* | | Merge branch 'master' into careminsterMelanie2012-05-131-0/+195
|\ \ \ | | |/ | |/|
| * | Add ConsoleTable framework class for future uniform formatting of console ↵Justin Clark-Casey (justincc)2012-05-101-8/+26
| | | | | | | | | | | | | | | | | | | | | output tables. Still subject to change - if you use this be prepared to change your output code if/when the methods change. Make new "attachments show" command use this.
| * | Add "attachments" show console command that will show the server's record of ↵Justin Clark-Casey (justincc)2012-05-101-0/+177
| | | | | | | | | | | | | | | | | | which attachments an in-scene avatar has. For debugging purposes.
* | | Merge branch 'master' into careminsterMelanie2012-05-072-3/+4
|\ \ \ | |/ /
| * | remove default values from prior commit since mono cant deal with themdahlia2012-05-072-3/+3
| | |
| * | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for ↵dahlia2012-05-061-1/+2
| | | | | | | | | | | | moving NPCs
* | | Merge branch 'master' into careminsterMelanie2012-05-052-48/+59
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-032-48/+59
| | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | | Merge branch 'master' into careminsterMelanie2012-04-291-2/+2
|\ \ \ | |/ /
| * | Remove mono compiler warning. Adjust message log to error from infoJustin Clark-Casey (justincc)2012-04-281-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-274-11/+57
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
| * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-264-21/+41
| |\ \
| * | | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-262-9/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osNpcSay(UUID npc, string message) left untouched New functions:- osNpcSay(UUID npc, int channel, string message) osNpcShout(UUID npc, int channel, string message) osNpcWhisper(UUID npc, int channel, string message) Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | | Merge branch 'master' into careminsterMelanie2012-04-251-15/+24
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-253-6/+17
| |\ \ \
| * | | | Add try/catch around Json script method registration to avoild some issuesMic Bowman2012-04-251-15/+24
| | |/ / | |/| | | | | | | | | | | | | | | | | | with .NET 3.5 vs 4.0 differences. See http://opensimulator.org/mantis/view.php?id=5971
* | | | Merge branch 'master' into careminsterMelanie2012-04-251-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-251-1/+1
| | | | | | | | | | | | | | | | These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
* | | | Merge branch 'master' into careminsterMelanie2012-04-251-10/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | | Minor improvements to loggingOren Hurvitz2012-04-241-2/+2
| | | | | | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
* | | | Merge branch 'master' into careminsterMelanie2012-04-241-3/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | Add online/offline indicator to "friends show" region console command.Justin Clark-Casey (justincc)2012-04-241-3/+14
| |/ / | | | | | | | | | Improve output table formatting.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-201-1/+7
|\ \ \ | | |/ | |/| | | | careminster
| * | Allow scripts in attachments owned by the NPC to control the NPCMelanie2012-04-181-1/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-184-1/+1421
|\ \ \ | |/ / |/| / | |/
| * clean up some more logging spam in the jsonstore modulesMic Bowman2012-04-172-2/+4
| |
| * Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.Mic Bowman2012-04-173-5/+7
| | | | | | | | Cut down on the logging spam.
| * This commit adds a new optional region module, JsonStore, that provides ↵Mic Bowman2012-04-173-0/+1416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structured storage (dictionaries and arrays of string values) for scripts and region modules. In addition, there are operations on the storage that enable "real" distributed computation between scripts through operations similar to those of a tuple space. Scripts can share task queues, implement shared locks or semaphores, etc. The structured store is limited to the current region and is not currently persisted. However, script operations are defined to initialize a store from a notecard and to serialize the store to a notecard. Documentation will be posted to the opensim wiki soon.
generated by cgit v1.1 at 2024-12-15 13:59:24 +0000