aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-61/+89
|\ | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| * Move frame loop entirely within Scene.Update() for better future performance ↵Justin Clark-Casey (justincc)2012-03-201-2/+15
| | | | | | | | | | | | | | | | analysis and stat accuracy. Update() now accepts a frames parameter which can control the number of frames updated. -1 will update until shutdown. The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
* | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-201-1954/+1988
|/ | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
* minor: reuse threadpool count we just fetched instead of fetching it againJustin Clark-Casey (justincc)2012-03-161-1/+1
|
* Add total scripts count to "show threads"Justin Clark-Casey (justincc)2012-03-161-2/+10
| | | | However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
* Improve threadpool reporting to "show threads" console command (also gets ↵Justin Clark-Casey (justincc)2012-03-162-7/+57
| | | | printed out periodically)
* Add process working memory to "show stats" memory statistics.Justin Clark-Casey (justincc)2012-03-162-4/+11
| | | | This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
* Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-122-2/+7
| | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-101-1/+51
|\
| * Factor out common default animations code into SLUtil. LLClientView now ↵Justin Clark-Casey (justincc)2012-03-091-1/+51
| | | | | | | | | | | | makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy. As per opensim-users mailing list discussion.
* | Serialize all web requests to a particular host:port pair; only applied to ↵Mic Bowman2012-03-091-0/+41
|/ | | | the PostToService variants.
* Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-083-33/+103
| | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* Use a fully stubbed out MockConsole for unit tests rather than inheriting ↵Justin Clark-Casey (justincc)2012-03-011-22/+37
| | | | | | | | from CommandConsole. This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands. This prevents the scene from being garbage collected at the end of a test. This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc.
* Flick master up to 0.7.4Justin Clark-Casey (justincc)2012-02-291-1/+1
|
* Some clean up in WebUtil, remove unused ServiceRequest function.Mic Bowman2012-02-271-71/+7
|
* Take watchdog alarm calling back outside the m_threads lock.Justin Clark-Casey (justincc)2012-02-241-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-242-2/+2
| | | | returns and for consistency.
* Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-242-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-211-0/+30
|
* On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-182-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.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-133-3/+37
|\
| * Change parser to leave embedded quotes alone if the pattern is recognizedMelanie2012-02-101-0/+34
| | | | | | | | as an OptionSet long option
| * minor: Remove warning from RegionInfo due to repeated config.GetString() ↵Justin Clark-Casey (justincc)2012-02-101-1/+0
| | | | | | | | call where the first was unused.
| * Add line numbers to Util.PrintCallStack()Justin Clark-Casey (justincc)2012-02-101-2/+3
| |
* | On object deserialization, go back to logging errors at DEBUG level rather ↵Justin Clark-Casey (justincc)2012-02-131-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.
* Set PhysPrimMax default to 0 so ini files won't be overriddenBlueWall2012-02-041-1/+1
|
* Make NonphysicalPrimMax setting work properlyBlueWall2012-02-041-1/+1
| | | | RegionInfo setting will override only if it is > 0
* Add TestRegionSettingsDeserializeJustin Clark-Casey (justincc)2012-02-042-1/+135
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-033-4/+12
|\
| * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-02-048-109/+215
| |\
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-032-2/+10
| | |\
| | | * Fix: Covenant changed time not set ↵PixelTomsen2012-02-032-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 Pfeffer2012-02-031-2/+2
| | |/ | |/| | | | | | | corresponding RemoteAdmin parameter
* | | Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-031-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-033-98/+62
| | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors()
* | Change LandDataSerializer deserialization so that in the future it won't ↵Justin Clark-Casey (justincc)2012-02-035-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/opensimDan Lake2012-02-026-21/+42
|\
| * Fix test failureMelanie2012-02-031-0/+1
| |
| * Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-025-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 savingMelanie2012-02-021-0/+11
| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | fix line endingsDan Lake2012-02-021-7/+7
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-019-167/+251
|\ \ | |/
| * Use Environment.TickCount & Int32.MaxValue; instead of ↵Justin Clark-Casey (justincc)2012-01-311-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.Melanie2012-01-301-0/+8
| | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts.
| * Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-281-2/+2
| | | | | | | | agent id anyway
| * llManageEstateAccess implementation ↵PixelTomsen2012-01-261-0/+6
| | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlManageEstateAccess Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * llGetParcelMusicURL implementation ↵Pixel Tomsen2012-01-251-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-241-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-241-14/+15
| | | | | | | | only contained the now uncollected and irrelevant inventory cache number.
| * Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-241-1/+1
| | | | | | | | spwan point positioning on rotated telehubs.