Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add process working memory to "show stats" memory statistics. | Justin Clark-Casey (justincc) | 2012-03-19 | 2 | -4/+11 |
| | | | | This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead) | ||||
* | Flick 0.7.3-post-fixes to Flavour.Post_Fixes | Justin Clark-Casey (justincc) | 2012-02-29 | 1 | -1/+1 |
| | |||||
* | Switch flavour to release | Justin Clark-Casey (justincc) | 2012-02-29 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into 0.7.3-post-fixes | Justin Clark-Casey (justincc) | 2012-02-24 | 4 | -21/+127 |
|\ | |||||
| * | Take watchdog alarm calling back outside the m_threads lock. | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -3/+16 |
| | | | | | | | | This is how it was originally. This stops a very long running alarm callback from causing a problem. | ||||
| * | Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ↵ | Justin Clark-Casey (justincc) | 2012-02-24 | 2 | -2/+2 |
| | | | | | | | | returns and for consistency. | ||||
| * | Stop spurious scene loop startup timeout alarms for scenes with many prims. | Justin Clark-Casey (justincc) | 2012-02-24 | 2 | -17/+42 |
| | | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout. | ||||
| * | Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+30 |
| | | |||||
| * | On Windows automatically load the correct native ODE library depending on ↵ | Justin Clark-Casey (justincc) | 2012-02-18 | 2 | -2/+40 |
| | | | | | | | | | | | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works. | ||||
* | | switch version flavour to rc2 | Justin Clark-Casey (justincc) | 2012-02-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into 0.7.3-post-fixes | Justin Clark-Casey (justincc) | 2012-02-15 | 4 | -9/+50 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-13 | 3 | -3/+37 |
| |\ | |||||
| | * | Change parser to leave embedded quotes alone if the pattern is recognized | Melanie | 2012-02-10 | 1 | -0/+34 |
| | | | | | | | | | | | | as an OptionSet long option | ||||
| | * | minor: Remove warning from RegionInfo due to repeated config.GetString() ↵ | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -1/+0 |
| | | | | | | | | | | | | call where the first was unused. | ||||
| | * | Add line numbers to Util.PrintCallStack() | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -2/+3 |
| | | | |||||
| * | | On object deserialization, go back to logging errors at DEBUG level rather ↵ | Justin Clark-Casey (justincc) | 2012-02-13 | 1 | -6/+13 |
| |/ | | | | | | | | | | | | | | | than ERROR. Restore extra log message if shape processing fails. Logging level was DEBUG before 312e145 (Fri Feb 3 2012). 312e145 also accidentally removed the 'general error' log message if any shape deserialization failed. This commit restores it, though this has no functional impact. | ||||
* | | Merge branch 'master' into 0.7.3-post-fixes | Justin Clark-Casey (justincc) | 2012-02-06 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Set PhysPrimMax default to 0 so ini files won't be overridden | BlueWall | 2012-02-04 | 1 | -1/+1 |
| | | |||||
| * | Make NonphysicalPrimMax setting work properly | BlueWall | 2012-02-04 | 1 | -1/+1 |
| | | | | | | | | RegionInfo setting will override only if it is > 0 | ||||
* | | Switch flavour to RC1. It will still be a while before RC1 is released. | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -1/+1 |
|/ | |||||
* | Add TestRegionSettingsDeserialize | Justin Clark-Casey (justincc) | 2012-02-04 | 2 | -1/+135 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-03 | 3 | -4/+12 |
|\ | |||||
| * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-02-04 | 8 | -109/+215 |
| |\ | |||||
| | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-03 | 2 | -2/+10 |
| | |\ | |||||
| | | * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵ | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | corresponding RemoteAdmin parameter | ||||
* | | | Change SceneObjectSerializer to use common ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 1 | -9/+28 |
| |/ |/| | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging. | ||||
* | | Refactor common deserialization processor code to generic method ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 3 | -98/+62 |
| | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() | ||||
* | | Change LandDataSerializer deserialization so that in the future it won't ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 5 | -75/+209 |
|/ | | | | | | care about extra elements or element order. This brings it into line with other deserializations such as object and will improve future backward compatibility. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-02 | 6 | -21/+42 |
|\ | |||||
| * | Fix test failure | Melanie | 2012-02-03 | 1 | -0/+1 |
| | | |||||
| * | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 5 | -21/+30 |
| | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts) | ||||
| * | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 1 | -0/+11 |
| | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids | ||||
* | | fix line endings | Dan Lake | 2012-02-02 | 1 | -7/+7 |
| | | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-01 | 9 | -167/+251 |
|\ \ | |/ | |||||
| * | Use Environment.TickCount & Int32.MaxValue; instead of ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff | ||||
| * | Add ParcelImageID to RegionSettings so we can have that overlay. | Melanie | 2012-01-30 | 1 | -0/+8 |
| | | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts. | ||||
| * | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 1 | -2/+2 |
| | | | | | | | | agent id anyway | ||||
| * | llManageEstateAccess implementation ↵ | PixelTomsen | 2012-01-26 | 1 | -0/+6 |
| | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlManageEstateAccess Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | llGetParcelMusicURL implementation ↵ | Pixel Tomsen | 2012-01-25 | 1 | -0/+6 |
| | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Comment out asset statistics section from periodic stats as these have not ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -108/+109 |
| | | | | | | | | | | | | | | been recorded for a very long time. Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness. Some data is available via other means (e.g. "fcache status"). | ||||
| * | Comment out inventory statistics section from periodic stats, since this ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -14/+15 |
| | | | | | | | | only contained the now uncollected and irrelevant inventory cache number. | ||||
| * | Simplify and streamline telehub editing code. Verify rotations and fix | Melanie | 2012-01-24 | 1 | -1/+1 |
| | | | | | | | | spwan point positioning on rotated telehubs. | ||||
| * | Reverse the spawn point distance vector | Melanie | 2012-01-24 | 1 | -3/+3 |
| | | |||||
| * | Correct a coordinate to make the viewer like it | Melanie | 2012-01-24 | 1 | -2/+2 |
| | | |||||
| * | Change Telehubs to store only the data that is really needed and not | Melanie | 2012-01-24 | 1 | -71/+45 |
| | | | | | | | | additional redundant information. | ||||
| * | Finish connecting Telehub to database | BlueWall | 2012-01-22 | 1 | -44/+6 |
| | | |||||
| * | Move Telehub tables and data from EstateSettings to RegionSettings. | Melanie | 2012-01-22 | 2 | -150/+150 |
| | | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off. | ||||
| * | Telehub Support: | BlueWall | 2012-01-21 | 1 | -0/+150 |
| | | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented. | ||||
| * | Telehub Support: | BlueWall | 2012-01-20 | 1 | -0/+5 |
| | | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing. |