aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Don't fail to create an IRC nick if nick randomization is disabled in the ↵Justin Clark-Casey (justincc)2012-09-201-3/+3
| | | | | | | | | | | | | | | | | | | | | IRC module. Patch from http://opensimulator.org/mantis/view.php?id=6293 Thanks Starflower.
| * | Moving ScriptModuleComms into the CoreModules tree.Mic Bowman2012-09-171-367/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-171-0/+31
|\ \ \ | |/ /
| * | Implementing ability to register script constants and invocations on a ↵SignpostMarv2012-09-171-0/+31
| | | | | | | | | | | | region module automatically
* | | Merge branch 'master' into careminsterMelanie2012-09-171-9/+9
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * | script invocations cannot have void return typeSignpostMarv2012-09-171-9/+9
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-163-9/+9
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Support multi-region OAR filesOren Hurvitz2012-09-141-1/+1
| | | | | | | | | | | | 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-112-8/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-092-2/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵SignpostMarv2012-09-082-2/+2
| | | | | | | | | | | | Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
* | | Merge branch 'master' into careminsterMelanie2012-08-311-1/+1
|\ \ \ | |/ /
| * | Type.Type is RuntimeTypeSignpostMarv2012-08-311-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-311-10/+38
|\ \ \ | |/ /
| * | formattingSignpostMarv2012-08-311-5/+5
| | |
| * | adding support for static method script invocationsSignpostMarv2012-08-311-0/+15
| | |
| * | moving assignment to new line to make next commit easier to read in diffsSignpostMarv2012-08-311-1/+2
| | |
| * | using specific type instead of varSignpostMarv2012-08-311-1/+1
| | |
| * | formattingSignpostMarv2012-08-311-1/+1
| | |
| * | formattingSignpostMarv2012-08-311-2/+1
| | |
| * | adding support for finding static methodsSignpostMarv2012-08-311-3/+9
| | |
| * | assign binding flags to variableSignpostMarv2012-08-311-1/+3
| | |
| * | no need to assign result to GetMethodInfoFromTypeSignpostMarv2012-08-311-3/+1
| | |
| * | changing to use Type argument instead of objectSignpostMarv2012-08-311-3/+3
| | |
| * | moving code that will be common into private static methodSignpostMarv2012-08-311-1/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-232-4/+6
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-202-0/+10
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
| * Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-151-3/+38
| | | | | | | | permissions and add support for this (incomplete!) to LSL
* | Fix a typoMelanie2012-08-181-1/+1
| |
* | Remove XML debug spam from vivox voiceMelanie2012-08-161-12/+12
| |
* | Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-151-3/+38
| | | | | | | | permissions and add support for this (incomplete!) to LSL
* | Remove NPC debug spamMelanie2012-08-141-7/+7
| |
* | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵Melanie2012-08-142-41/+65
|\ \ | | | | | | | | | avination
| * \ Merge branch 'master' into careminsterMelanie2012-08-141-33/+29
| |\ \ | | |/
| | * Prevent race conditions when one thread removes an NPC SP before another ↵Justin Clark-Casey (justincc)2012-08-141-34/+30
| | | | | | | | | | | | thread has retreived it after checking whether the NPC exists.
| * | Merge branch 'master' into careminsterMelanie2012-08-141-8/+36
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| | * Perform ownership transfer and permission propagation as well as neededMelanie2012-08-141-0/+28
| | | | | | | | | | | | updates on the new temp attachment.
| | * Move inititalization to RegionLoaded to avoid a module loading order issueMelanie2012-08-141-8/+8
| | |
* | | Removed more spammy NPC crapMelanie2012-08-141-1/+1
| | |
* | | Comment spammy debugMelanie2012-08-141-3/+3
|/ /
* | Merge branch 'master' into careminsterMelanie2012-08-141-0/+126
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Implement the temp attachments. UNTESTEDMelanie2012-08-141-0/+44
| |
| * Add the skeleton for the temp attachments moduleMelanie2012-08-141-0/+82
| |
* | Merge branch 'master' into careminsterMelanie2012-08-031-25/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Save membership fee to the database when a group is created.Kevin Cozens2012-08-031-25/+25
| |
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+33
|\ \ | |/
| * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-311-0/+33
| | | | | | | | constants to the script engine.
* | Merge branch 'master' into careminsterMelanie2012-07-288-5/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-253-0/+3
| | | | | | | | with other monitoring code from OpenSim.Framework
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-254-4/+4
| | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.