| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-12-09 | 1 | -0/+561 |
| |\ | |||||
| | * | Format change | BlueWall | 2012-12-07 | 1 | -1/+1 |
| | | | | | | | | | Removed some white space in a line, looking to trigger a build | ||||
| | * | Merge branch 'master' into connector_plugin | BlueWall | 2012-12-07 | 4 | -22/+517 |
| | |\ | |||||
| | * \ | Merge branch 'master' into connector_plugin | BlueWall | 2012-11-25 | 47 | -754/+1721 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/Base/ServicesServerBase.cs | ||||
| | * \ \ | Merge branch 'master' into connector_plugin | BlueWall | 2012-10-20 | 11 | -184/+586 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into connector_plugin | BlueWall | 2012-10-19 | 1 | -0/+53 |
| | |\ \ \ \ | |||||
| | * | | | | | Move PluginManager | BlueWall | 2012-10-19 | 1 | -0/+561 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Move PluginManager out to OpenSimFramework for general use | ||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-12-07 | 4 | -22/+517 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | | | | Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the ↵ | Justin Clark-Casey (justincc) | 2012-12-07 | 1 | -0/+508 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aim of avoiding OpenSimulator problems due to script thread aborts. When an object is removed, its scripts are stopped and then the thread running them is aborted if stop takes too long. However, it appears that aborting a thread at just the wrong moment when it is obtaining a ReaderWriterLockSlim lock can leave this lock in an inconsistent state. One symptom of this is that mono leaps to 100% cpu and a vm thread dump reveals lots of threads waiting for a ReaderWriterLockSlim lock without any thread actually holding it. This is probably the same problem as encountered originally in commit 12cebb12 This commit looks to plaster this problem by putting lock obtaining methods inside finally blocks which should be uninterruptible by thread aborts. | ||||
| | * | | | | | Remove very probably unused PrimitiveBaseShape(bool) constructor to reduce ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -12/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | code complexity | ||||
| | * | | | | | Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | is ignored by the ExtraParams properly anyway | ||||
| | * | | | | | minor: tidy up spacing at bottom of MundaneFrameworkTests | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -6/+2 |
| | | | | | | | |||||
| | * | | | | | In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -1/+1 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | than creating a new CultureInfo separately | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 17 | -193/+148 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | ||||
| | * | | | | Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵ | Justin Clark-Casey (justincc) | 2012-11-24 | 12 | -13/+21 |
| | | | | | | | | | | | | | | | | | | | | | automatically turns off any logging enabled between tests | ||||
| | * | | | | Fix bug where loading an OAR with a deeded parcel would always set the ↵ | Justin Clark-Casey (justincc) | 2012-11-24 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes. | ||||
| | * | | | | Make "show threads" and "thread abort" console commands available on all servers | Justin Clark-Casey (justincc) | 2012-11-23 | 3 | -108/+103 |
| | | | | | | |||||
| | * | | | | Make "force gc" console command available across all servers | Justin Clark-Casey (justincc) | 2012-11-23 | 2 | -11/+12 |
| | | | | | | |||||
| | * | | | | Make "show version" console command available across all servers | Justin Clark-Casey (justincc) | 2012-11-23 | 2 | -8/+7 |
| | | | | | | |||||
| | * | | | | Delete unused BaseHttpServer.HandleAgentRequest() | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -53/+0 |
| | | | | | | |||||
| * | | | | | Fix new command console code to match the output of the original while keeping | Melanie | 2012-11-23 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | the new features | ||||
| * | | | | | Add a newline before the constant help text | Melanie | 2012-11-23 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Revert help to display a full command list. Leave the help categories in as | Melanie | 2012-11-23 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | "help categories" in case it turns out useful in the future. May not work. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 1 | -1/+28 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Add "help all" console command which will list all commands alphabetically ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | | in a single list | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-22 | 7 | -344/+561 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Factor out command script code. | Justin Clark-Casey (justincc) | 2012-11-22 | 1 | -2/+50 |
| | | | | | | | | | | | | | | | | | | | | | This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers | ||||
| | * | | | | Make "config show/set/get/save" console commands available on all servers | Justin Clark-Casey (justincc) | 2012-11-22 | 1 | -3/+137 |
| | | | | | | |||||
| | * | | | | Factor out common pid file creation and removal code. | Justin Clark-Casey (justincc) | 2012-11-22 | 2 | -40/+47 |
| | | | | | | | | | | | | | | | | | | | | | Log path at which pid file is created or reason for failure to create. | ||||
| | * | | | | Add "get log level" command - this returns the current server session ↵ | Justin Clark-Casey (justincc) | 2012-11-22 | 1 | -19/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console logging level. This supersedes getting information by calling "set log level" without a 4th argument, which is confusing. | ||||
| | * | | | | Remove unused BaseOpenSimServer.ShowHelp() | Justin Clark-Casey (justincc) | 2012-11-22 | 1 | -21/+0 |
| | | | | | | |||||
| | * | | | | Make "set log level" command available across all servers | Justin Clark-Casey (justincc) | 2012-11-22 | 2 | -31/+31 |
| | | | | | | |||||
| | * | | | | Make "show info" command available across all servers | Justin Clark-Casey (justincc) | 2012-11-22 | 2 | -179/+183 |
| | | | | | | | | | | | | | | | | | | | | | This helpfully lists version information, startup location and console log level | ||||
| | * | | | | Factor out common registration of "show uptime" command | Justin Clark-Casey (justincc) | 2012-11-22 | 2 | -66/+76 |
| | | | | | | |||||
| | * | | | | factor out common HandleShow code for "show uptime" | Justin Clark-Casey (justincc) | 2012-11-22 | 7 | -46/+69 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-22 | 2 | -25/+62 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | refactor: Factor out copy/pasted server uptime report code | Justin Clark-Casey (justincc) | 2012-11-22 | 2 | -25/+62 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-20 | 1 | -2/+5 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | minor: If logging full incoming HTTP data, don't deceptively print ... at ↵ | Justin Clark-Casey (justincc) | 2012-11-20 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | the end of the body. | ||||
| * | | | | | Merge branch 'avination' into careminster | Melanie | 2012-11-20 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | * Plumbing and basic setting of the GetMesh Cap Throttler. | teravus | 2012-11-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Last step is to flip the throttle distribution. | ||||
| | * | | | | | Revert "Merge master into teravuswork", it should have been avination, not ↵ | teravus | 2012-11-15 | 31 | -1808/+639 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64. | ||||
| | * | | | | | Merge master into teravuswork | teravus | 2012-11-15 | 31 | -639/+1808 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster | Melanie | 2012-11-20 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | ||||
| | * | | | | | | * Prep work switching the GetMeshModule over to a poll service. | teravus | 2012-11-09 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet. | ||||
| * | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵ | teravus | 2012-11-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. | ||||
| | * | | | | | | Add AnimState to CADU | Melanie | 2012-10-30 | 1 | -0/+18 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 5 | -174/+363 |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid | Justin Clark-Casey (justincc) | 2012-11-17 | 1 | -17/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |