Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
| * | Make SceneManager.OnRegionsReadyStatusChange event available. | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -1/+1 |
| | | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-07-25 | 1 | -32/+39 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | ||||
| * | Rename "image queues clear" console command to "clear image queues" | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -12/+6 |
| | | | | | | | | | | There is less justification for this word arrangement (verb after noun) now that command help is categorized. Also removes "image queues show" in favour of existing alias "show image queues". | ||||
| * | Add information about each column to "show queues" region console command help. | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -2/+9 |
| | | |||||
| * | Extend region console "show queues" command to show already collected time ↵ | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -18/+24 |
| | | | | | | | | since last packeted received by the simulator from a viewer. | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-07-20 | 2 | -2/+2 |
|\ \ | |||||
| * | | Fix slow loading of task inventory | Melanie | 2012-07-19 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-20 | 2 | -3/+1 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-07-19 | 2 | -3/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-19 | 1 | -69/+59 |
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | 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 | ||||
| * | Add EventManager.OnRegionLoginsStatusChange fired whenever logins are ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 1 | -3/+1 |
| | | | | | | | | | | | | | | enabled or disabled at any point, not just during initial startup. This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled and was affected by a bug where it would never fire if the region started with logins disabled. |