Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-11-27 | 3 | -4/+66 | |
| |\ | ||||||
| | * | Stop logging spurious asset data for {0} is zero length error for sculpts/mesh | Justin Clark-Casey (justincc) | 2012-11-28 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ODEPrim, for instance, always hits this code path twice at the moment Firstly before any sculpt data has been loaded (hence the spurious message) Secondly when any sculpt data has been loaded or failed to load (when the message would be valid). Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead (though this is not ideal since it requires all physics plugins to copy/paste similar code). | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-11-28 | 4 | -205/+296 | |
| | |\ | ||||||
| | * | | Show many more primitive properties on console command "show part name/id/pos" | Justin Clark-Casey (justincc) | 2012-11-28 | 1 | -3/+57 | |
| | | | | ||||||
| * | | | Bug fix in Offline IM for inventory transfers. The items were being placed ↵ | Diva Canto | 2012-11-27 | 1 | -11/+15 | |
| | |/ | |/| | | | | | | | twice in the receiver's inventory. | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-11-27 | 120 | -2727/+3739 | |
| |\ \ | ||||||
| | * | | BulletSim: reorganize linear movement routine into separate subroutines ↵ | Robert Adams | 2012-11-27 | 1 | -58/+79 | |
| | | | | | | | | | | | | | | | | enabling external calibration routines and unit tests. | |||||
| | * | | BulletSim: fix terrain mesh generation for problem with regions that have ↵ | Robert Adams | 2012-11-27 | 1 | -6/+16 | |
| | | | | | | | | | | | | | | | | unequal edge heights. Thanks UBit. | |||||
| | * | | BulletSim: reorganize angular movement routine into separate subroutines ↵ | Robert Adams | 2012-11-27 | 1 | -95/+114 | |
| | | | | | | | | | | | | | | | | enabling external calibration routines and unit testing. | |||||
| | * | | BulletSim: implementation of vertical attraction motor. | Robert Adams | 2012-11-27 | 1 | -41/+62 | |
| | | | | ||||||
| | * | | BulletSim: add 'infinite' timescale that does not reduce motor target or ↵ | Robert Adams | 2012-11-27 | 1 | -10/+27 | |
| | |/ | | | | | | | | | | friction. | |||||
| | * | Fix database service unit test failures by temporarily reverting ↵ | Justin Clark-Casey (justincc) | 2012-11-26 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BasicDataServiceTest extending OpenSimTestCase. Mono 2.4.3 doesn't like this when running nunit, with nunit throwing AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true. and similar. Mono 2.10.8.1 does not have this issue. So will wait until min version of mono bumps before restoring. | |||||
| | * | BulletSim: increase vehicle stability by suppressing Bullet's update to ↵ | Robert Adams | 2012-11-26 | 4 | -59/+26 | |
| | | | | | | | | | | | | angular velocity. | |||||
| | * | BulletSim: use m_angularMotor to do the basic movement. Add the setting of ↵ | Robert Adams | 2012-11-25 | 1 | -60/+64 | |
| | | | | | | | | | | | | same. Rename the angular forces and add comments to match MoveAngular to the form of MoveLinear. | |||||
| | * | BulletSim: up the vehicle angular damping to 0.95. Still trying to overcome ↵ | Robert Adams | 2012-11-25 | 1 | -2/+2 | |
| | | | | | | | | | | | | the movement added by Bullet. | |||||
| | * | BulletSim: organize MoveLinear code for understandability. Make ↵ | Robert Adams | 2012-11-25 | 1 | -89/+40 | |
| | | | | | | | | | | | | LIMIT_MOTOR_UP contribution a velocity and not a force. | |||||
| | * | BulletSim: add ToString override to BSVMotor. | Robert Adams | 2012-11-25 | 1 | -1/+6 | |
| | | | ||||||
| | * | BulletSim: add BSVMotor as BSDynamics linear motor. | Robert Adams | 2012-11-25 | 2 | -27/+74 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly limit *_MOTOR_DECAY_TIMESCALE to 120 as per specs. Invode BSDynamics.Refresh() when vehicle type is changed. Previously the vehicle properties weren't getting set because the physical properties were set before the vehicle type was set. Add a "use name" to BSMotors for identification while debugging. Correct current and target confusion in BSVMotor design. Rename CurrentValueReductionTimescale to FrictionTimescale. Event more detailed logging. | |||||
| | * | BulletSim: clean up TODO list. It is kept somewhere wlse that should be more ↵ | Robert Adams | 2012-11-25 | 2 | -18/+17 | |
| | | | | | | | | | | | | public. Add error logging for the detail log writer so a message is output when it cannot write to the specified logging directory. Modify friction defaults to be closer to ODE's values. Add new collision margin and vehicle angular damping parameters. | |||||
| | * | BulletSim: small change to add position correction force with AddForce ↵ | Robert Adams | 2012-11-25 | 2 | -16/+22 | |
| | | | | | | | | | | | | rather than just storing it in the variable | |||||
| | * | BulletSim: complete vector motor. Correct line endings. | Robert Adams | 2012-11-25 | 1 | -104/+129 | |
| | | | ||||||
| | * | BulletSim: add terrain collision margin and vehicle angular damping | Robert Adams | 2012-11-25 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | parameters to the parameter block. New API call for setting collision margin. | |||||
| | * | BulletSim: add parameter for terrain collision margin. | Robert Adams | 2012-11-25 | 3 | -54/+45 | |
| | | | | | | | | | | | | Add locking around unlikely but possible race conditions on terrain list. | |||||
| | * | BulletSim: Add tables and initialization for different attributes for ↵ | Robert Adams | 2012-11-25 | 2 | -0/+198 | |
| | | | | | | | | | | | | different materials. For the moment, the per material tables are not used. | |||||
| * | | Prevent the core Groups module from being enabled when its name doesn't ↵ | Diva Canto | 2012-11-27 | 1 | -0/+3 | |
| | | | | | | | | | | | | match the "default" ini choice | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-11-25 | 2 | -2/+5 | |
|\ \ \ | ||||||
| * | | | * Fix a null ref error in ↵ | teravus | 2012-11-24 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339 | |||||
| * | | | Remove a superfluous newline from help | Melanie | 2012-11-23 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 87 | -640/+960 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||||
| * | | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ↵ | Justin Clark-Casey (justincc) | 2012-11-24 | 3 | -106/+83 | |
| | | | | | | | | | | | | | | | | | | functionally identical. Move TestDeleteSceneObjectAsync() and TestDeleteSceneObjectAsyncToUserInventory() from SceneObjectBasicTests -> SceneObjectDeRezTests | |||||
| * | | Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a ↵ | Justin Clark-Casey (justincc) | 2012-11-24 | 1 | -7/+12 | |
| | | | | | | | | | | | | BasicInventoryAccessModule() and re-enable in test suite. | |||||
| * | | Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵ | Justin Clark-Casey (justincc) | 2012-11-24 | 65 | -67/+80 | |
| | | | | | | | | | | | | automatically turns off any logging enabled between tests | |||||
| * | | In ArchiverTests, use the local instantiated SceneManager rather than ↵ | Justin Clark-Casey (justincc) | 2012-11-24 | 1 | -20/+7 | |
| | | | | | | | | | | | | potentially cross-contaminating tests by relying on the static SceneManager.Instance | |||||
| * | | Fix bug where loading an OAR with a deeded parcel would always set the ↵ | Justin Clark-Casey (justincc) | 2012-11-24 | 13 | -239/+609 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes. | |||||
| * | | minor: Add some currently commented out debug log lines for investigating ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -0/+5 | |
| | | | | | | | | | | | | issues resolving group IDs for land parcels on OAR loading where groups do not exist | |||||
| * | | Make "show threads" and "thread abort" console commands available on all servers | Justin Clark-Casey (justincc) | 2012-11-23 | 3 | -108/+103 | |
| | | | ||||||
| * | | Make "force gc" console command available across all servers | Justin Clark-Casey (justincc) | 2012-11-23 | 2 | -11/+12 | |
| | | | ||||||
| * | | Make "show version" console command available across all servers | Justin Clark-Casey (justincc) | 2012-11-23 | 2 | -8/+7 | |
| | | | ||||||
| * | | Delete unused BaseHttpServer.HandleAgentRequest() | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -53/+0 | |
| | | | ||||||
| * | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-11-23 | 2 | -3/+3 | |
| | | | ||||||
| * | | minor: Make note in log if scene was restarted due to an unrecoverable ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -1/+6 | |
| | | | | | | | | | | | | physics error | |||||
| * | | Add AllowRegionRestartFromClient setting to [EstateManagement] section of ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -40/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSim.ini. Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate. One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules, though these should be fixed as soon as practicable. Default is true, as has been the case historically. | |||||
* | | | 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 | |
|/ / / |