aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
| | | |/ | | |/|
| * | | Change SceneObjectSerializer to use common ExternalRepresentationUtils.Execut...Justin Clark-Casey (justincc)2012-02-031-9/+28
| | |/ | |/|
| * | Refactor common deserialization processor code to generic method ExternalRepr...Justin Clark-Casey (justincc)2012-02-033-98/+62
| * | Change LandDataSerializer deserialization so that in the future it won't care...Justin Clark-Casey (justincc)2012-02-035-75/+209
| |/
* | 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
* | | | 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
|\ \ \ \ | |/ / /
| * | | Improve reliability of script state saving by covering various savingMelanie2012-02-021-0/+11
| | |/ | |/|
* | | Improve reliability of script state saving by covering various savingMelanie2012-02-021-2/+12