aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-11-252-2/+5
|\
| * Merge branch 'teravuswork' of careminster:/var/git/careminster into teravusworkteravus2012-11-240-0/+0
| |\
| | * * Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMes...teravus2012-11-241-0/+2
| * | * Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMes...teravus2012-11-241-0/+3
| |/
| * Remove a superfluous newline from helpMelanie2012-11-231-2/+2
* | Merge branch 'master' into careminsterMelanie2012-11-2589-644/+974
|\ \ | |/ |/|
| * Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ...Justin Clark-Casey (justincc)2012-11-243-106/+83
| * Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a BasicInv...Justin Clark-Casey (justincc)2012-11-241-7/+12
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which automati...Justin Clark-Casey (justincc)2012-11-2466-68/+83
| * In ArchiverTests, use the local instantiated SceneManager rather than potenti...Justin Clark-Casey (justincc)2012-11-241-20/+7
| * Fix bug where loading an OAR with a deeded parcel would always set the parcel...Justin Clark-Casey (justincc)2012-11-2414-240/+613
| * minor: Add some currently commented out debug log lines for investigating iss...Justin Clark-Casey (justincc)2012-11-231-0/+5
| * Make "show threads" and "thread abort" console commands available on all serversJustin Clark-Casey (justincc)2012-11-233-108/+103
| * Make "force gc" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-11/+12
| * Make "show version" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-8/+7
| * Delete unused BaseHttpServer.HandleAgentRequest()Justin Clark-Casey (justincc)2012-11-231-53/+0
| * Enable further client stack packet pooling by default by setting RecycleBaseU...Justin Clark-Casey (justincc)2012-11-231-2/+1
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-11-232-3/+3
| * minor: Make note in log if scene was restarted due to an unrecoverable physic...Justin Clark-Casey (justincc)2012-11-231-1/+6
| * Add AllowRegionRestartFromClient setting to [EstateManagement] section of Ope...Justin Clark-Casey (justincc)2012-11-232-40/+69
* | Merge branch 'careminster' into avinationMelanie2012-11-237-33/+129
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-11-237-33/+129
| |\ \ | | |/
| | * Remove the redundant BypassPermissions() checks in EstateManagmentModule.Justin Clark-Casey (justincc)2012-11-231-8/+13
| | * minor: Add some console feedback on region restart and log who requested a re...Justin Clark-Casey (justincc)2012-11-232-1/+9
| | * Fix problem where restarting the currently selected region would stop various...Justin Clark-Casey (justincc)2012-11-234-36/+51
| | * Add regression test for checking scene close when SceneManager is asked to closeJustin Clark-Casey (justincc)2012-11-231-0/+58
* | | Fix new command console code to match the output of the original while keepingMelanie2012-11-231-2/+5
* | | Remove duplicate registration of the help topics for the module commanderMelanie2012-11-231-5/+5
|/ /
* | Add a newline before the constant help textMelanie2012-11-231-0/+1
* | Revert help to display a full command list. Leave the help categories in asMelanie2012-11-231-5/+6
* | Fix a build break introduced by us having a more efficient DoubleDictionaryMelanie2012-11-231-4/+8
* | Merge branch 'master' into careminsterMelanie2012-11-231-1/+28
|\ \ | |/
| * Add "help all" console command which will list all commands alphabetically in...Justin Clark-Casey (justincc)2012-11-231-1/+28
* | Merge branch 'master' into careminsterMelanie2012-11-232-0/+8
|\ \ | |/
| * Fix recent windows build break.justincc2012-11-231-0/+1
| * Fix regression where we stopped closing scenes on simulator exit.Justin Clark-Casey (justincc)2012-11-231-0/+7
* | Merge branch 'master' into careminsterMelanie2012-11-2211-54/+54
|\ \ | |/
| * Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because itMelanie2012-11-2211-54/+54
* | Merge branch 'master' into careminsterMelanie2012-11-2213-706/+605
|\ \ | |/
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-223-77/+50
| * Make "config show/set/get/save" console commands available on all serversJustin Clark-Casey (justincc)2012-11-226-189/+172
| * Factor out common pid file creation and removal code.Justin Clark-Casey (justincc)2012-11-223-62/+50
| * Add "get log level" command - this returns the current server session console...Justin Clark-Casey (justincc)2012-11-221-19/+31
| * Remove unused BaseOpenSimServer.ShowHelp()Justin Clark-Casey (justincc)2012-11-221-21/+0
| * Make "set log level" command available across all serversJustin Clark-Casey (justincc)2012-11-223-32/+31
| * Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-225-237/+186
| * Factor out common registration of "show uptime" commandJustin Clark-Casey (justincc)2012-11-223-71/+78
| * factor out common HandleShow code for "show uptime"Justin Clark-Casey (justincc)2012-11-229-63/+72
* | Merge branch 'avination' into careminsterMelanie2012-11-221-7/+35
|\ \
| * | * While this is not producing any problems.. and does help in low bandwidth ...teravus2012-11-221-7/+35