aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-168-14/+87
|\
| * Fix some logic mistakes where firstly osNpcCreate() without options was creat...Justin Clark-Casey (justincc)2012-02-163-5/+20
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-154-23/+101
| |\
| * | In ObjectTortureTests, run garbage collector on Teardown and run scene loop u...Justin Clark-Casey (justincc)2012-02-155-10/+68
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-02-158-164/+252
|\ \ \
| * | | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-146-157/+232
| * | | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-144-9/+22
* | | | Merge branch 'master' into careminsterMelanie2012-02-1517-361/+906
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-143-15/+38
| * | Fix a race condition in the simian groups connector. When requests wereMic Bowman2012-02-131-8/+63
| |/
| * Fix: get embedded objects from Notecard fails with activated FreeSwitchVoiceM...PixelTomsen2012-02-141-3/+3
| * Fix: Lightshare Module(Windlight)-Region settings are not applicable for data...PixelTomsen2012-02-144-307/+692
| * Fix: MSSQLDB Grid - unable to register region http://opensimulator.org/mantis...PixelTomsen2012-02-141-1/+8
| * Revert "Add GridStore migration for MSSQL."Justin Clark-Casey (justincc)2012-02-141-8/+0
| * Add GridStore migration for MSSQL.Justin Clark-Casey (justincc)2012-02-141-0/+8
| * Add some more data to the new user connection logging for debug purposes.Justin Clark-Casey (justincc)2012-02-141-3/+3
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-141-1/+6
| |\
| | * short circuit the expensive parts of the permission checking codeMic Bowman2012-02-131-1/+6
| * | Update [XEngine] AppDomainLoading advice in OpenSim.ini.exampleJustin Clark-Casey (justincc)2012-02-141-4/+9
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-1311-23/+143
| |\
| | * correct the default avatar_terminal_velocity value that I accidentally left i...Justin Clark-Casey (justincc)2012-02-111-1/+1
| | * Clamp ODE character velocity. Make ODE falling character 54m/s by default.Justin Clark-Casey (justincc)2012-02-113-1/+58
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-111-0/+34
| | |\
| | * | Make ScenePresence.MovementFlag a private only settable value to reduce compl...Justin Clark-Casey (justincc)2012-02-111-7/+4
| * | | On object deserialization, go back to logging errors at DEBUG level rather th...Justin Clark-Casey (justincc)2012-02-132-11/+22
* | | | Merge branch 'master' into careminsterMelanie2012-02-106-15/+47
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-101-0/+12
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-101-9/+20
| | |\ \
| | * \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-02-102-3/+12
| | |\ \ \
| | * | | | Fix: Covenant view fails after updates or cache-clean see mantis http://opens...PixelTomsen2012-02-101-0/+12
| | | |_|/ | | |/| |
| * | | | Add line numbers to Util.PrintCallStack()Justin Clark-Casey (justincc)2012-02-101-2/+3
| | |_|/ | |/| |
| * | | Fix an npc delete race condition with LSL sensors where an initial presence c...Justin Clark-Casey (justincc)2012-02-101-9/+20
| | |/ | |/|
| * | Fix bug where somebody taking a copy of an object they didn't own that was re...Justin Clark-Casey (justincc)2012-02-102-3/+12
| |/
* | Change parser to leave embedded quotes alone if the pattern is recognizedMelanie2012-02-101-0/+34
* | Merge branch 'master' into careminsterMelanie2012-02-1013-20/+244
|\ \ | |/
| * Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.or...PixelTomsen2012-02-102-8/+8
| * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer per...Justin Clark-Casey (justincc)2012-02-106-11/+40
| * Fix another Torture test build break on Windows.Justin Clark-Casey (justincc)2012-02-091-0/+1
| * If NPCModule.CreateNPC() fails to create the required ScenePresence (which sh...Justin Clark-Casey (justincc)2012-02-092-9/+8
| * Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.Justin Clark-Casey (justincc)2012-02-092-0/+188
* | Merge branch 'master' into careminsterMelanie2012-02-098-14/+70
|\ \ | |/
| * minor: put in commented out logging statements for future reuseJustin Clark-Casey (justincc)2012-02-092-1/+10
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-081-0/+1
| |\
| | * Add missing reference to prebuild.xml for torture testsRobert Adams2012-02-071-0/+1
| * | Stop a scene object from attempting to link with itself (which results in an ...Justin Clark-Casey (justincc)2012-02-084-10/+54
| |/
| * Make WebStats logging report consistently as WEB STATS MODULE instead of VC, ...Justin Clark-Casey (justincc)2012-02-071-6/+5
* | Push more NPC stuff into threadsMelanie2012-02-082-23/+40
* | Merge branch 'master' into careminsterMelanie2012-02-0714-111/+145
|\ \ | |/