aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-183-11/+76
|\
| * 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
| * Improve threadpool reporting to "show threads" console command (also gets pri...Justin Clark-Casey (justincc)2012-03-162-7/+57
| * Add process working memory to "show stats" memory statistics.Justin Clark-Casey (justincc)2012-03-162-4/+11
* | added ObjectPhysicsProperties http event message to send viewer that data. F...UbitUmarov2012-03-151-0/+2
* | Merge branch 'master' into careminsterMelanie2012-03-142-2/+7
|\ \ | |/
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-122-2/+7
* | initial suport for ExtraPhysical parts parameters. Reading from llclientView ...UbitUmarov2012-03-132-1/+51
* | Refactor, move OjectChangeData into it's own file and renameMelanie2012-03-131-0/+80
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-03-112-1/+92
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-03-112-1/+92
| |\ \ | | |/
| | * 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 make...Justin Clark-Casey (justincc)2012-03-091-1/+51
| | * | Serialize all web requests to a particular host:port pair; only applied to th...Mic Bowman2012-03-091-0/+41
| | |/
* | | BIG MESS. changed Iclient interface so only one event is used to inform scene...UbitUmarov2012-03-101-0/+3
|/ /
* | Merge branch 'master' into careminsterMelanie2012-03-083-33/+103
|\ \ | |/
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-083-33/+103
* | Merge branch 'master' into careminsterMelanie2012-03-033-94/+45
|\ \ | |/
| * Use a fully stubbed out MockConsole for unit tests rather than inheriting fro...Justin Clark-Casey (justincc)2012-03-011-22/+37
| * 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
| * Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ...Justin Clark-Casey (justincc)2012-02-242-2/+2
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-242-17/+42
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+30
|\ \ | |/
| * 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
|\ \ | |/
| * On Windows automatically load the correct native ODE library depending on whe...Justin Clark-Casey (justincc)2012-02-182-2/+40
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-02-151-0/+11
|\ \
| * | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-141-0/+11
* | | 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 th...Justin Clark-Casey (justincc)2012-02-131-6/+13
* | | 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
| * | minor: Remove warning from RegionInfo due to repeated config.GetString() call...Justin Clark-Casey (justincc)2012-02-101-1/+0
| * | 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
* | Merge branch 'master' into careminsterMelanie2012-02-051-2/+2
|\ \ | |/
| * 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
* | Merge branch 'master' into careminsterMelanie2012-02-049-111/+370
|\ \ | |/
| * 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 http://opensimulator.org/mantis/view.php?i...PixelTomsen2012-02-032-2/+10
| | * | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ...Snoopy Pfeffer2012-02-031-2/+2
| | | |/ | | |/|