Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'avination' into ubitwork | Melanie | 2012-12-03 | 7 | -108/+384 |
|\ | |||||
| * | *TEST* diferent avatar collider | UbitUmarov | 2012-12-03 | 3 | -103/+350 |
| | | |||||
| * | fix vertex rounding direction | UbitUmarov | 2012-12-03 | 1 | -1/+8 |
| | | |||||
| * | *TEST* reduce all mesh vertices resolution to 1e-5. This reduces number | UbitUmarov | 2012-12-03 | 1 | -0/+16 |
| | | | | | | | | of unique vertices only originated by math errors in PrimMesher | ||||
| * | adjust avatar standing Z position | UbitUmarov | 2012-12-03 | 1 | -5/+11 |
| | | |||||
| * | Add a transaction ID to the money module path for llTransferLindenDollars | Melanie | 2012-12-03 | 3 | -4/+4 |
| | | |||||
* | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-12-01 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Merge branch 'teravuswork' of careminster:/var/git/careminster into teravuswork | teravus | 2012-11-24 | 0 | -0/+0 |
| |\ | |||||
| | * | * Fix a null ref error in ↵ | teravus | 2012-11-24 | 1 | -0/+2 |
| | | | | | | | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339 | ||||
| * | | * Fix a null ref error in ↵ | teravus | 2012-11-24 | 1 | -0/+3 |
| |/ | | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339 | ||||
* | | don't zero constant force and torque in selection | UbitUmarov | 2012-11-24 | 1 | -6/+6 |
| | | |||||
* | | avoid potencial NullReferenceException | UbitUmarov | 2012-11-24 | 1 | -2/+5 |
|/ | |||||
* | Remove a superfluous newline from help | Melanie | 2012-11-23 | 1 | -2/+2 |
| | |||||
* | Merge branch 'careminster' into avination | Melanie | 2012-11-23 | 7 | -33/+129 |
|\ | |||||
| * | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 7 | -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-23 | 1 | -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-23 | 2 | -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-23 | 4 | -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 close | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -0/+58 |
| | | | |||||
* | | | Fix new command console code to match the output of the original while keeping | Melanie | 2012-11-23 | 1 | -2/+5 |
| | | | | | | | | | | | | the new features | ||||
* | | | Remove duplicate registration of the help topics for the module commander | Melanie | 2012-11-23 | 1 | -5/+5 |
|/ / | |||||
* | | Add a newline before the constant help text | Melanie | 2012-11-23 | 1 | -0/+1 |
| | | |||||
* | | Revert help to display a full command list. Leave the help categories in as | Melanie | 2012-11-23 | 1 | -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 DoubleDictionary | Melanie | 2012-11-23 | 1 | -4/+8 |
| | | | | | | | | where core has a simple list | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 1 | -1/+28 |
|\ \ | |/ | |||||
| * | Add "help all" console command which will list all commands alphabetically ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -1/+28 |
| | | | | | | | | in a single list | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 2 | -0/+8 |
|\ \ | |/ | |||||
| * | Fix recent windows build break. | justincc | 2012-11-23 | 1 | -0/+1 |
| | | | | | | | | Add missing OpenSim.Framework.Servers reference | ||||
| * | Fix regression where we stopped closing scenes on simulator exit. | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -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 careminster | Melanie | 2012-11-22 | 11 | -54/+54 |
|\ \ | |/ | |||||
| * | Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it | Melanie | 2012-11-22 | 11 | -54/+54 |
| | | | | | | | | conflicts with PhysicsShape type defined in later libOMV | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-22 | 13 | -706/+605 |
|\ \ | |/ | |||||
| * | Factor out command script code. | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -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 servers | Justin Clark-Casey (justincc) | 2012-11-22 | 6 | -189/+172 |
| | | |||||
| * | Factor out common pid file creation and removal code. | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -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-22 | 1 | -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-22 | 1 | -21/+0 |
| | | |||||
| * | Make "set log level" command available across all servers | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -32/+31 |
| | | |||||
| * | Make "show info" command available across all servers | Justin Clark-Casey (justincc) | 2012-11-22 | 5 | -237/+186 |
| | | | | | | | | This helpfully lists version information, startup location and console log level | ||||
| * | Factor out common registration of "show uptime" command | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -71/+78 |
| | | |||||
| * | factor out common HandleShow code for "show uptime" | Justin Clark-Casey (justincc) | 2012-11-22 | 9 | -63/+72 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-11-22 | 1 | -7/+35 |
|\ \ | |||||
| * | | * While this is not producing any problems.. and does help in low bandwidth ↵ | teravus | 2012-11-22 | 1 | -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 careminster | Melanie | 2012-11-22 | 3 | -48/+66 |
|\ \ \ | | |/ | |/| | |||||
| * | | refactor: Factor out copy/pasted server uptime report code | Justin Clark-Casey (justincc) | 2012-11-22 | 3 | -48/+66 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-22 | 21 | -325/+893 |
|\ \ \ | |/ / | |||||
| * | | If an asset POST does not contain well-formed XML, return a 400 (Bad ↵ | Justin Clark-Casey (justincc) | 2012-11-22 | 2 | -3/+38 |
| | | | | | | | | | | | | Request) HTTP status rather than simply dropping the request. | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-11-22 | 17 | -322/+715 |
| |\ \ | |||||
| | * | | BulletSim: update DLLs and SOs. No functional changes. Only the parameter ↵ | Robert Adams | 2012-11-21 | 4 | -0/+0 |
| | | | | | | | | | | | | | | | | block format changed. | ||||
| | * | | BulletSim: Make avatar capsule so it is not circular. | Robert Adams | 2012-11-21 | 7 | -22/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple attempt to make avatars better shaped. Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth' and 'avatarCapsuleDepth'. More tweeking to avatar height calculation. A little better but short avatar's feet are above the terrain and tall avatar's feet are a little below the ground. |