Commit by melanie :: r5023cc86f095 /OpenSim/Framework/Console/CommandConsole.cs:

 Change parser to leave embedded quotes alone if the pattern is recognized
as an OptionSet long option

Commit by melanie :: racfe7e555e41 /OpenSim/ (6 files in 5 dirs):

Merge branch 'master' into careminster

Commit by melanie :: r5023cc86f095 /OpenSim/Framework/Console/CommandConsole.cs:

 Change parser to leave embedded quotes alone if the pattern is recognized
as an OptionSet long option

Commit by melanie :: r4455140f3040 /OpenSim/Framework/Console/CommandConsole.cs:

 Change parser to leave embedded quotes alone if the pattern is recognized
as an OptionSet long option

Commit by melanie on ubitwork :: r215acbcc9667 / (13 files in 11 dirs):

 Merge branch 'master' into careminster

Conflicts:
        OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
        OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs

Commit by melanie on ubitwork :: r7c888f6af11b / (8 files in 6 dirs):

 Merge branch 'master' into careminster

Conflicts:
        OpenSim/Region/Framework/Scenes/SceneGraph.cs

Commit by melanie :: r215acbcc9667 / (13 files in 11 dirs):

 Merge branch 'master' into careminster

Conflicts:
        OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
        OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs

Commit by melanie :: r7c888f6af11b / (8 files in 6 dirs):

 Merge branch 'master' into careminster

Conflicts:
        OpenSim/Region/Framework/Scenes/SceneGraph.cs

Commit by melanie :: r9c6ba8d18f4b /OpenSim/Region/ (2 files in 2 dirs):

Push more NPC stuff into threads

Commit by melanie :: r236e1c45f2f4 / (14 files in 12 dirs):

Merge branch 'master' into careminster

Commit by melanie :: rde255321f1f1 / (14 files in 10 dirs):

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Commit by melanie :: ra829f208280b /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs:

Experimental. Expand Fire & Forget for NPC delete

Commit by melanie :: r37049180f62d / (14 files in 10 dirs):

 Merge branch 'master' into careminster

Conflicts:
        OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
        OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

Commit by melanie on 0.7.3-post-fixes :: r130b1c0665d0 /OpenSim/Region/CoreModules/World/Land/LandObject.cs:

 Revert my two quick fixes for the lag issue and put in the real fix, which
is to only write to the database if data was changed. I was writing to the db
on every step of every avatar. Sure to give us lag, that.

Commit by melanie on 0.7.3-post-fixes :: ra5fcdde179f4 /OpenSim/Region/CoreModules/World/Land/LandObject.cs:

 Revert "Remove checks on ban list expiry on every move. To be re-added on parcel"

This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56.

Commit by melanie on 0.7.3-post-fixes :: r0904772a6f14 /OpenSim/Region/CoreModules/World/Land/ (LandManagementModule.cs LandObject.cs):

 Revert "Check ban list for a particular parcel only when an avatar moves into it."

This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461.

Commit by melanie on 0.7.3-post-fixes :: r35f14a262dfa /OpenSim/Region/CoreModules/World/Land/LandObject.cs:

 Remove checks on ban list expiry on every move. To be re-added on parcel
boundary crossing only as soon as I'm properly awake. This should fix
recent performance issues

Commit by melanie on 0.7.3-post-fixes :: r8923ad755d97 /OpenSim/Region/CoreModules/World/Land/ (LandManagementModule.cs LandObject.cs):

 Check ban list for a particular parcel only when an avatar moves into it.
This restores functionality remove in the last commit without reintroducing
the performance penalty.

Commit by melanie :: r130b1c0665d0 /OpenSim/Region/CoreModules/World/Land/LandObject.cs:

 Revert my two quick fixes for the lag issue and put in the real fix, which
is to only write to the database if data was changed. I was writing to the db
on every step of every avatar. Sure to give us lag, that.

Commit by melanie :: ra5fcdde179f4 /OpenSim/Region/CoreModules/World/Land/LandObject.cs:

 Revert "Remove checks on ban list expiry on every move. To be re-added on parcel"

This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56.