| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 31 | -94/+478 |
| |\ | | | | | | | | | 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 | 8 | -24/+342 |
| | | | |||||
| | * | 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 | 12 | -14/+28 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-27 | 35 | -295/+705 |
| | |\ | |||||
| | | * | 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 | ||||
| | | * | Add asset name and description truncation warnings to SQLite database plugin ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -5/+23 |
| | | | | | | | | | | | | | for consistency. | ||||
| | | * | Add more information to warnings logged when asset names and descriptions ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 3 | -6/+18 |
| | | | | | | | | | | | | | | | | | | | | | | have to be truncated for database storage On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are. Even though they are never subsequently (inventory names/descriptions are always used instead). | ||||
| | * | | Moved the HG default variables out of [Startup] and into their own section ↵ | Diva Canto | 2013-02-27 | 12 | -14/+14 |
| | | | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 5 | -13/+273 |
| |\ \ \ | | |/ | |/| | | | | | | | 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 |
| | | | | |||||
| | * | | Show http poll handlers in separate http (poll) section of "show ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | http-handlers" console command instead of never showing them (due to a previous bug). The code was assuming that poll handlers were also included in general http handlers but this was not the case. | ||||
| | * | | 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 | 20 | -216/+301 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | 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 | 14 | -212/+245 |
| | | | | | | | | | | | | | places where we were not already. | ||||
| | * | | minor: remove warning in ConfigurationLoaderTest | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -0/+2 |
| | | | | |||||
| | * | | Add regression test for llRequestUrl() | Justin Clark-Casey (justincc) | 2013-02-26 | 4 | -22/+84 |
| | | | | |||||
| | * | | 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 | 16 | -269/+708 |
| |\ \ \ | |/ / | |||||
| | * | | BulletSim: tweeks to make avatar jump work better. | Robert Adams | 2013-02-25 | 1 | -4/+6 |
| | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-25 | 6 | -39/+56 |
| | |\ | |||||
| | | * | Move map related settings from [Startup] to a new [Map] section in OpenSim.ini | Justin Clark-Casey (justincc) | 2013-02-25 | 6 | -39/+56 |
| | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | Mantis #6552 -- stricter error (crash) if server URL is malformed. | Diva Canto | 2013-02-25 | 1 | -5/+2 |
| | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-25 | 5 | -218/+628 |
| | |\ | |||||
| | | * | 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. | ||||
| | | * | Make StatsManager default output a little more readable | Robert Adams | 2013-02-24 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add EventHistogram.GetHistogramAsOSDMap that returns that parameters | Robert Adams | 2013-02-24 | 1 | -211/+228 |
| | | | | | | | | | | | | | about the histogram as well as the values. | ||||
| | | * | Modify StatsManager so console command "show stats category container" | Robert Adams | 2013-02-24 | 1 | -5/+24 |
| | | | | | | | | | | | | | only outputs the statistics in the specified container in the category. | ||||
| | | * | 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. | ||||
| | * | | Fixes mantis #6551 -- misspelled key name. Also fixed an issue with the ↵ | Diva Canto | 2013-02-25 | 4 | -3/+16 |
| | |/ | | | | | | | roles cache. | ||||
| * | | 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 | 15 | -60/+129 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-22 | 2 | -42/+87 |
| | |\ | |||||
| | | * | minor: Add doc to ScenePresence.IsInTransit to make it clear that this is ↵ | Justin Clark-Casey (justincc) | 2013-02-22 | 1 | -0/+6 |
| | | | | | | | | | | | | | set only for region crossing and not teleport, etc. | ||||
| | | * | Make reset of EntityTransferStateMachine for an avatar transfer always ↵ | Justin Clark-Casey (justincc) | 2013-02-22 | 1 | -42/+81 |
| | | | | | | | | | | | | | | | | | | | | | | happen despite unexpected exceptions. This means that if such an exception does occur, the region does not need to be reset before that user can teleport from it again. This is all Oren's code from his patch in http://opensimulator.org/mantis/view.php?id=6374 but I've chosen to split it in two. | ||||
| | * | | Added new Util function for reading config vars that's more generic than the ↵ | Diva Canto | 2013-02-22 | 13 | -15/+54 |
| | |/ | | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup] | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 132 | -711/+11859 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-21 | 4 | -3/+236 |
| | |\ | |||||
| | | * | Add a virtual ToOSDMap() function to Monitoring.Stat for future | Robert Adams | 2013-02-21 | 1 | -0/+16 |
| | | | | | | | | | | | | | overloading by aggregation statistics and browser based stat viewers. | ||||
| | | * | Add CounterStat which is a wrapper for a counter stat but, because | Robert Adams | 2013-02-21 | 2 | -1/+218 |
| | | | | | | | | | | | | | | | | | | | | | | the 'count' event is internal, historical data can be built it. Also includes EventHistogram class for building time based, bucketed history of event occurances. Make Stat implement IDisposable for subclasses that might need it. | ||||
| | | * | minor: Change summary in "show appearance" console command to "incomplete" ↵ | Justin Clark-Casey (justincc) | 2013-02-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | rather than "corrupt" Corrupt is misleading - it implies textures were uploaded but are not j2k valid. The actual situation is that at least one required baked texture is not present. | ||||
| | * | | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵ | Diva Canto | 2013-02-21 | 13 | -37/+79 |
| | |/ | | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency. | ||||
| | * | BulletSim: add OutOfBounds logic and some position sanity checking | Robert Adams | 2013-02-21 | 5 | -33/+68 |
| | | | | | | | | | to eliminate some of the "cannot find terrain height" warning messages. | ||||
| | * | Add a method to IStatsCollector for returning stats as an OSDMap. | Robert Adams | 2013-02-20 | 6 | -4/+82 |
| | | | | | | | | | | | | | Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format). | ||||
| | * | Add flush after write feature to LogWriter | Robert Adams | 2013-02-20 | 1 | -1/+12 |
| | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |