| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2013-03-03 | 14 | -59/+109 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | ||||
| | * | Make Keyframe motion cross regions again | Melanie | 2013-03-03 | 2 | -2/+4 |
| | | | |||||
| | * | Make a viewer sent XML error prettier | Melanie | 2013-03-03 | 1 | -0/+4 |
| | | | |||||
| | * | Reinstate uploading temporary textures | Melanie | 2013-02-27 | 1 | -4/+4 |
| | | | |||||
| | * | Try to update inventory items when there is a valid asset - may fix temp ↵ | Melanie | 2013-02-27 | 1 | -0/+5 |
| | | | | | | | | | textures | ||||
| | * | Remove osParseJSONNew because it's "object" return type is not useful for LSL | root | 2013-02-25 | 3 | -7/+1 |
| | | | |||||
| | * | Make banking no longer break sit rotations. Fix spinning avatars. | Melanie | 2013-02-25 | 1 | -3/+6 |
| | | | |||||
| | * | Revert "Output some additional data on Vivox connection errors", this logs ↵ | Melanie | 2013-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | passwords! Bad! This reverts commit 79e477f6af09fae2d88a1bba45de6cb819e2800a. | ||||
| | * | Output some additional data on Vivox connection errors | Melanie | 2013-02-24 | 1 | -1/+1 |
| | | | |||||
| | * | The viewer tries to parse the error message body to LLSD - give it some. | Melanie | 2013-02-24 | 1 | -2/+2 |
| | | | |||||
| | * | Revert "Allow TeleportCancel packets to reset the transfer state machine" | Melanie | 2013-02-24 | 1 | -6/+0 |
| | | | | | | | | | This reverts commit 0e17887e03fb6d32cdd07838caa56e34103ae8f2. | ||||
| | * | Fix an issue where the viewer would request the seed cap before | Melanie | 2013-02-18 | 4 | -34/+68 |
| | | | | | | | | | there was a handler for it. | ||||
| | * | Correctly remove https:// URLs from the http server. | Melanie | 2013-02-17 | 1 | -1/+7 |
| | | | |||||
| | * | Fix shape parameters sent for meshes tosupport the full number of faces | Melanie | 2013-02-16 | 1 | -0/+8 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-01 | 10 | -59/+122 |
| |\ \ | |||||
| | * | | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵ | Diva Canto | 2013-03-01 | 2 | -23/+36 |
| | | | | | | | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-01 | 4 | -15/+63 |
| | |\ \ | |||||
| | | * | | BulletSim: more things into the TODO list. | Robert Adams | 2013-03-01 | 1 | -1/+6 |
| | | | | | |||||
| | | * | | BulletSim: add parameters, code cleanup around checking and enforcing | Robert Adams | 2013-03-01 | 3 | -14/+57 |
| | | | | | | | | | | | | | | | | | maximum velocity and angular velocity values for prims. | ||||
| | * | | | Add the Mono AddinDependency attribute to the example region modules. | Justin Clark-Casey (justincc) | 2013-03-01 | 2 | -2/+4 |
| | |/ / | | | | | | | | | | It turns out this is required to get Mono.Addins to pick up plugin DLLs | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-01 | 1 | -19/+15 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-28 | 5 | -24/+299 |
| | | |\ \ | |||||
| | | * | | | Bug fix in DataSnapshot, where a var was being used before being initialized. | Diva Canto | 2013-02-28 | 1 | -19/+15 |
| | | | | | | |||||
| | * | | | | minor: Log location in which simulator/robust was started. | Justin Clark-Casey (justincc) | 2013-02-28 | 1 | -0/+4 |
| | | |/ / | |/| | | | | | | | | | | Useful information for system debugging, especially if logging and ini files locations have been changed from defaults. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 15 | -56/+354 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| | * | | | Fix potential concurrency issue since the LSL notecard cache was not being ↵ | Justin Clark-Casey (justincc) | 2013-02-28 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | | checked for expiry under lock | ||||
| | * | | | Fix bug where simultaneous calls by different scripts to llGetNotecardLine() ↵ | Justin Clark-Casey (justincc) | 2013-02-28 | 1 | -12/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or llGetNumberOfNotecardLines() would sometimes not trigger a dataserver event. This was because the notecard asset ID was being used as the request identifier. Now using a random ID, in common with other code using the DataServer | ||||
| | * | | | Add regression tests for llGetNotecardLine() | Justin Clark-Casey (justincc) | 2013-02-28 | 4 | -5/+275 |
| | |/ / | |||||
| | * | | Removed duplicate 'using' statement. | Diva Canto | 2013-02-27 | 1 | -1/+0 |
| | | | | |||||
| | * | | Switched to using the other Util function with a default value. | Diva Canto | 2013-02-27 | 4 | -6/+12 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-27 | 19 | -118/+432 |
| | |\ \ | |||||
| | | * | | Add comment to example region modules about need to add Assembly annotation ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | | if adding modules to a DLL which does not already have this | ||||
| | | * | | Get "show modules" console command to obey selected command line region/s | Justin Clark-Casey (justincc) | 2013-02-27 | 3 | -18/+13 |
| | | | | | |||||
| | | * | | Get "show modules" console command to show modules in alphabetical order, ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -7/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | and group shared and non-shared modules together This is to make it easier to tell if a region has a certain module active or not | ||||
| | * | | | Moved the HG default variables out of [Startup] and into their own section ↵ | Diva Canto | 2013-02-27 | 4 | -6/+6 |
| | | | | | | | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 4 | -11/+268 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | ||||
| | * | | | minor: remove some mono compiler warnings in script regression tests | Justin Clark-Casey (justincc) | 2013-02-27 | 2 | -2/+1 |
| | | | | | |||||
| | * | | | Add regression test for llReleaseUrl() (and for llRequestUrl) | Justin Clark-Casey (justincc) | 2013-02-27 | 2 | -9/+266 |
| | | | | | | | | | | | | | | | | | Forgot to add file for llRequestUrl() test in commit b8a7c8b | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 10 | -64/+103 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | | | Make sure we dispose of WebResponse, StreamReader and Stream in various ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 5 | -54/+71 |
| | | | | | | | | | | | | | | | | | places where we were not already. | ||||
| | * | | | Add regression test for llRequestUrl() | Justin Clark-Casey (justincc) | 2013-02-26 | 3 | -16/+33 |
| | | | | | |||||
| | * | | | BulletSim: fix crash around race condition when a mesh asset cannot | Robert Adams | 2013-02-26 | 2 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | | be fetched. Update TODO list. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-02-26 | 8 | -38/+416 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | BulletSim: tweeks to make avatar jump work better. | Robert Adams | 2013-02-25 | 1 | -4/+6 |
| | |/ / | |||||
| | * | | Move map related settings from [Startup] to a new [Map] section in OpenSim.ini | Justin Clark-Casey (justincc) | 2013-02-25 | 5 | -33/+35 |
| | | | | | | | | | | | | | | | | | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings. | ||||
| | * | | Add StatsManager registration for region specific stats as collected | Robert Adams | 2013-02-24 | 1 | -1/+47 |
| | | | | | | | | | | | | | | | | by MonitorModule. Left existing functionality (command line and HTTP fetch) and just added StatsManager registration. | ||||
| | * | | Streamline stat registration code in ServerStats. Remove most of the | Robert Adams | 2013-02-24 | 1 | -160/+50 |
| | | | | | | | | | | | | | | | | usage of ProcessCounters which tend to fail oddly and are not supported everywhere. | ||||
| | * | | Addition of ServerStats shared region module which collects and registers | Robert Adams | 2013-02-24 | 1 | -0/+438 |
| | | | | | | | | | | | | | server wide statistics (CPU%, network bytes sent, ...) with StatsManager. | ||||
| * | | | Make sure state machine is reset if crossing is aborted | Melanie | 2013-02-23 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-23 | 6 | -52/+83 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |