aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-083-33/+103
|\
| * 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.
* | Merge branch 'master' into careminsterMelanie2012-03-033-94/+45
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * 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
| |
* | Merge branch 'master' into careminsterMelanie2012-02-243-19/+57
|\ \ | |/
| * 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.
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+30
|\ \ | |/ | | | | Conflicts:
| * 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
| |
* | Merge branch 'master' into careminsterMelanie2012-02-182-2/+40
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * 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://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-02-151-0/+11
|\ \ | | | | | | | | | careminster
| * | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-141-0/+11
| | | | | | | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet.
* | | Merge branch 'master' into careminsterMelanie2012-02-151-6/+13
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-133-3/+37
| |\
| * | 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.
* | | Merge branch 'master' into careminsterMelanie2012-02-102-3/+3
|\ \ \ | | |/ | |/|
| * | 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
| |/
* | Change parser to leave embedded quotes alone if the pattern is recognizedMelanie2012-02-101-0/+34
| | | | | | | | as an OptionSet long option
* | Merge branch 'master' into careminsterMelanie2012-02-051-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * 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
* | Merge branch 'master' into careminsterMelanie2012-02-049-111/+370
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * 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' into careminsterMelanie2012-02-031-18/+23
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-026-21/+42
| |\
| * | fix line endingsDan Lake2012-02-021-7/+7
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-019-167/+251
| |\ \
| * | | Fixed bugs in earlier commit on custom user parameters in Regions.iniDan Lake2012-01-191-20/+25
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-02-031-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | 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)
* | | | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-025-21/+30
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-02-021-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | 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
* | | Improve reliability of script state saving by covering various savingMelanie2012-02-021-2/+12
| | | | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | | Merge branch 'master' into careminsterMelanie2012-01-311-1/+1
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-12-29 17:43:33 +0000