aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Set UseMeshiesPhysicsMesh = true in [Mesh] by defaultJustin Clark-Casey (justincc)2012-02-071-4/+3
| * Add start GC memory and end GC memory to object stress test printouts.Justin Clark-Casey (justincc)2012-02-074-4/+22
| * Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ex...Justin Clark-Casey (justincc)2012-02-079-103/+120
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-0714-46/+336
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-0714-46/+336
| |\ \ | | |/
| | * Add TestAddTaskInventoryItem()Justin Clark-Casey (justincc)2012-02-072-4/+34
| | * Add warning about only uncommenting EstateConnectionString if you know what y...Justin Clark-Casey (justincc)2012-02-071-0/+2
| | * Remove debug logging if physics actor is null in SOP.ApplyPhysics()Justin Clark-Casey (justincc)2012-02-071-5/+1
| | * Add TestCompileAndStart100Scripts() torture test.Justin Clark-Casey (justincc)2012-02-073-1/+160
| | * Add a regression test to compile and start a script. Remove Path.GetDirector...Justin Clark-Casey (justincc)2012-02-077-37/+137
* | | Experimental. Expand Fire & Forget for NPC deleteMelanie2012-02-061-7/+7
|/ /
* | Merge branch 'master' into careminsterMelanie2012-02-057-12/+12
|\ \ | |/
| * Revert my two quick fixes for the lag issue and put in the real fix, whichMelanie2012-02-051-1/+2
| * Revert "Remove checks on ban list expiry on every move. To be re-added on par...Melanie2012-02-051-4/+4
| * Revert "Check ban list for a particular parcel only when an avatar moves into...Melanie2012-02-052-17/+4
| * Make configuration uniformBlueWall2012-02-051-3/+3
| * Check ban list for a particular parcel only when an avatar moves into it.Melanie2012-02-052-4/+17
| * Remove checks on ban list expiry on every move. To be re-added on parcelMelanie2012-02-051-4/+4
| * Set PhysPrimMax default to 0 so ini files won't be overriddenBlueWall2012-02-041-1/+1
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| * change NonPhysicalPrimMax to NonphysicalPrimMax to make this variablenebadon2012-02-042-2/+2
| * Make NonphysicalPrimMax setting work properlyBlueWall2012-02-041-1/+1
| * Quiet the map module loggingBlueWall2012-02-041-2/+2
* | Merge branch 'master' into careminsterMelanie2012-02-0434-254/+561
|\ \ | |/
| * Add default value to TelehubObjectBlueWall2012-02-041-0/+10