| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Don't fail to create an IRC nick if nick randomization is disabled in the ↵ | Justin Clark-Casey (justincc) | 2012-09-20 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | IRC module. Patch from http://opensimulator.org/mantis/view.php?id=6293 Thanks Starflower. | |||||
| | * | | Moving ScriptModuleComms into the CoreModules tree. | Mic Bowman | 2012-09-17 | 1 | -367/+0 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-17 | 1 | -0/+31 | |
| |\ \ \ | |/ / | ||||||
| | * | | Implementing ability to register script constants and invocations on a ↵ | SignpostMarv | 2012-09-17 | 1 | -0/+31 | |
| | | | | | | | | | | | | | region module automatically | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-17 | 1 | -9/+9 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||||
| | * | | script invocations cannot have void return type | SignpostMarv | 2012-09-17 | 1 | -9/+9 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 3 | -9/+9 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs | |||||
| | * | | Support multi-region OAR files | Oren Hurvitz | 2012-09-14 | 1 | -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 Bowman | 2012-09-11 | 2 | -8/+8 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 2 | -2/+2 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵ | SignpostMarv | 2012-09-08 | 2 | -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 careminster | Melanie | 2012-08-31 | 1 | -1/+1 | |
| |\ \ \ | |/ / | ||||||
| | * | | Type.Type is RuntimeType | SignpostMarv | 2012-08-31 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 1 | -10/+38 | |
| |\ \ \ | |/ / | ||||||
| | * | | formatting | SignpostMarv | 2012-08-31 | 1 | -5/+5 | |
| | | | | ||||||
| | * | | adding support for static method script invocations | SignpostMarv | 2012-08-31 | 1 | -0/+15 | |
| | | | | ||||||
| | * | | moving assignment to new line to make next commit easier to read in diffs | SignpostMarv | 2012-08-31 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | using specific type instead of var | SignpostMarv | 2012-08-31 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | formatting | SignpostMarv | 2012-08-31 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | formatting | SignpostMarv | 2012-08-31 | 1 | -2/+1 | |
| | | | | ||||||
| | * | | adding support for finding static methods | SignpostMarv | 2012-08-31 | 1 | -3/+9 | |
| | | | | ||||||
| | * | | assign binding flags to variable | SignpostMarv | 2012-08-31 | 1 | -1/+3 | |
| | | | | ||||||
| | * | | no need to assign result to GetMethodInfoFromType | SignpostMarv | 2012-08-31 | 1 | -3/+1 | |
| | | | | ||||||
| | * | | changing to use Type argument instead of object | SignpostMarv | 2012-08-31 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | moving code that will be common into private static method | SignpostMarv | 2012-08-31 | 1 | -1/+8 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-23 | 2 | -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-20 | 2 | -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 ↵ | Melanie | 2012-08-15 | 1 | -3/+38 | |
| | | | | | | | | | permissions and add support for this (incomplete!) to LSL | |||||
| * | | Fix a typo | Melanie | 2012-08-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | Remove XML debug spam from vivox voice | Melanie | 2012-08-16 | 1 | -12/+12 | |
| | | | ||||||
| * | | Let the temp attachment module add a command to allow attaching without ↵ | Melanie | 2012-08-15 | 1 | -3/+38 | |
| | | | | | | | | | permissions and add support for this (incomplete!) to LSL | |||||
| * | | Remove NPC debug spam | Melanie | 2012-08-14 | 1 | -7/+7 | |
| | | | ||||||
| * | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-08-14 | 2 | -41/+65 | |
| |\ \ | | | | | | | | | | avination | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -33/+29 | |
| | |\ \ | | |/ | ||||||
| | | * | Prevent race conditions when one thread removes an NPC SP before another ↵ | Justin Clark-Casey (justincc) | 2012-08-14 | 1 | -34/+30 | |
| | | | | | | | | | | | | | thread has retreived it after checking whether the NPC exists. | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -8/+36 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||||
| | | * | Perform ownership transfer and permission propagation as well as needed | Melanie | 2012-08-14 | 1 | -0/+28 | |
| | | | | | | | | | | | | | updates on the new temp attachment. | |||||
| | | * | Move inititalization to RegionLoaded to avoid a module loading order issue | Melanie | 2012-08-14 | 1 | -8/+8 | |
| | | | | ||||||
| * | | | Removed more spammy NPC crap | Melanie | 2012-08-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Comment spammy debug | Melanie | 2012-08-14 | 1 | -3/+3 | |
| |/ / | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -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. UNTESTED | Melanie | 2012-08-14 | 1 | -0/+44 | |
| | | | ||||||
| | * | Add the skeleton for the temp attachments module | Melanie | 2012-08-14 | 1 | -0/+82 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 1 | -25/+25 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | * | Save membership fee to the database when a group is created. | Kevin Cozens | 2012-08-03 | 1 | -25/+25 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 1 | -0/+33 | |
| |\ \ | |/ | ||||||
| | * | Adds support to ScriptModuleComms for region modules to export | Mic Bowman | 2012-07-31 | 1 | -0/+33 | |
| | | | | | | | | | constants to the script engine. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 8 | -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-25 | 3 | -0/+3 | |
| | | | | | | | | | with other monitoring code from OpenSim.Framework | |||||
| | * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. | Justin Clark-Casey (justincc) | 2012-07-25 | 4 | -4/+4 | |
| | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |