aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* move characters (avatars) to own collision space, also fixing a problemUbitUmarov2012-12-043-14/+47
| | | | with previus code that was still assuming the avatar is g2
* raise standing avatar a bit to reduce knees bending on some collisions.UbitUmarov2012-12-041-4/+4
| | | | reduce head size a bit
* Merge branch 'avination' into ubitworkMelanie2012-12-037-108/+384
|\
| * *TEST* diferent avatar colliderUbitUmarov2012-12-033-103/+350
| |
| * fix vertex rounding directionUbitUmarov2012-12-031-1/+8
| |
| * *TEST* reduce all mesh vertices resolution to 1e-5. This reduces numberUbitUmarov2012-12-031-0/+16
| | | | | | | | of unique vertices only originated by math errors in PrimMesher
| * adjust avatar standing Z positionUbitUmarov2012-12-031-5/+11
| |
| * Add a transaction ID to the money module path for llTransferLindenDollarsMelanie2012-12-033-4/+4
| |
* | Merge branch 'avination' into ubitworkUbitUmarov2012-12-011-0/+3
|\ \ | |/
| * Merge branch 'teravuswork' of careminster:/var/git/careminster into teravusworkteravus2012-11-240-0/+0
| |\
| | * * Fix a null ref error in ↵teravus2012-11-241-0/+2
| | | | | | | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
| * | * Fix a null ref error in ↵teravus2012-11-241-0/+3
| |/ | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
* | don't zero constant force and torque in selectionUbitUmarov2012-11-241-6/+6
| |
* | avoid potencial NullReferenceExceptionUbitUmarov2012-11-241-2/+5
|/
* Remove a superfluous newline from helpMelanie2012-11-231-2/+2
|
* Merge branch 'careminster' into avinationMelanie2012-11-237-33/+129
|\
| * Merge branch 'master' into careminsterMelanie2012-11-237-33/+129
| |\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| | * Remove the redundant BypassPermissions() checks in EstateManagmentModule.Justin Clark-Casey (justincc)2012-11-231-8/+13
| | | | | | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
| | * minor: Add some console feedback on region restart and log who requested a ↵Justin Clark-Casey (justincc)2012-11-232-1/+9
| | | | | | | | | | | | region restart if done from the viewer.
| | * Fix problem where restarting the currently selected region would stop ↵Justin Clark-Casey (justincc)2012-11-234-36/+51
| | | | | | | | | | | | | | | | | | various console commands (e.g. "show users") from working. This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
| | * 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
| | | | | | | | | | | | the new features
* | | 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
| | | | | | | | "help categories" in case it turns out useful in the future. May not work.
* | Fix a build break introduced by us having a more efficient DoubleDictionaryMelanie2012-11-231-4/+8
| | | | | | | | where core has a simple list
* | Merge branch 'master' into careminsterMelanie2012-11-231-1/+28
|\ \ | |/
| * Add "help all" console command which will list all commands alphabetically ↵Justin Clark-Casey (justincc)2012-11-231-1/+28
| | | | | | | | in a single list
* | Merge branch 'master' into careminsterMelanie2012-11-232-0/+8
|\ \ | |/
| * Fix recent windows build break.justincc2012-11-231-0/+1
| | | | | | | | Add missing OpenSim.Framework.Servers reference
| * Fix regression where we stopped closing scenes on simulator exit.Justin Clark-Casey (justincc)2012-11-231-0/+7
| | | | | | | | | | If we don't do this, then these scenes don't get deregistered from the grid, amongst other things. Regression was introduced in commit 8c130bc (Mon Nov 12 22:50:28 2012 +0000)
* | Merge branch 'master' into careminsterMelanie2012-11-2211-54/+54
|\ \ | |/
| * Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because itMelanie2012-11-2211-54/+54
| | | | | | | | conflicts with PhysicsShape type defined in later libOMV
* | Merge branch 'master' into careminsterMelanie2012-11-2213-706/+605
|\ \ | |/
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-223-77/+50
| | | | | | | | This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
| * 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
| | | | | | | | Log path at which pid file is created or reason for failure to create.
| * Add "get log level" command - this returns the current server session ↵Justin Clark-Casey (justincc)2012-11-221-19/+31
| | | | | | | | | | | | console logging level. This supersedes getting information by calling "set log level" without a 4th argument, which is confusing.
| * 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
| | | | | | | | This helpfully lists version information, startup location and console log level
| * 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
| | | | | | | | | | | | situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet.
* | | Merge branch 'master' into careminsterMelanie2012-11-223-48/+66
|\ \ \ | | |/ | |/|
| * | refactor: Factor out copy/pasted server uptime report codeJustin Clark-Casey (justincc)2012-11-223-48/+66
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-2221-325/+893
|\ \ \ | |/ /
| * | If an asset POST does not contain well-formed XML, return a 400 (Bad ↵Justin Clark-Casey (justincc)2012-11-222-3/+38
| | | | | | | | | | | | Request) HTTP status rather than simply dropping the request.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-2217-322/+715
| |\ \