Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 3 | -27/+34 |
|\ | |||||
| * | - cleaning up LandData/ILandObject capitalization issues | dr scofield (aka dirk husemann) | 2009-10-02 | 2 | -15/+15 |
| | | | | | | | | - adding LandDataSerializer to OAR mechanics | ||||
| * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-02 | 1 | -12/+19 |
| |\ | |||||
| | * | Added messages to assertions in the failing tests, so that we know which ↵ | Diva Canto | 2009-10-01 | 1 | -12/+19 |
| | | | | | | | | | | | | ones are failing. | ||||
| * | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 3 | -36/+16 |
| |/ | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | ||||
* | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 3 | -36/+16 |
| | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | ||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-01 | 35 | -738/+487 |
|\ \ | |/ | |||||
| * | Removed an innefficent List.Contains lookup from UpdateQueue | James J Greensky | 2009-09-30 | 1 | -5/+4 |
| | | | | | | | | | | | | Changed the underlying data structure used to detected duplicate in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a List to a Dictionary. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-09-30 | 8 | -13/+13 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 8 | -13/+13 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-09-30 | 32 | -829/+616 |
| |\ \ | | |/ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 27 | -124/+124 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim | dr scofield (aka dirk husemann) | 2009-09-29 | 2 | -0/+22 |
| | |\ | |||||
| | | * | A little hack to see if this fixes the problems with ~20% of SOG's becoming ↵ | Diva Canto | 2009-09-29 | 2 | -0/+22 |
| | | | | | | | | | | | | | | | | phantom after an import to megaregions. | ||||
| | * | | This fix addresses the problem where phantom objects do not | Alan M Webb | 2009-09-29 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | | | | | | | | | always behave like they are phantom, and llVolumeDetect seems to operate in a random fashion. Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net> | ||||
| | * | I think I have fixed something that was broken in the scene setup (tests) ↵ | Diva Canto | 2009-09-28 | 1 | -3/+4 |
| | | | | | | | | | | | | and that needs to be reflected in all other services setups. But the teleport test still doesn't work. Commenting it for now. | ||||
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-28 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-09-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | Improved the Local grid connector to fetch data from the DB when it doesn't ↵ | Diva Canto | 2009-09-28 | 1 | -3/+4 |
| | |/ | | | | | | | | | | | | | | | | find it in the cache. Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes. | ||||
| | * | Neighbours cache working. | Diva Canto | 2009-09-27 | 2 | -3/+5 |
| | | | |||||
| | * | Unpacking the mess with OtherRegionUp, so we can have a real cache of the ↵ | Diva Canto | 2009-09-27 | 5 | -95/+74 |
| | | | | | | | | | | | | neighbours in the grid service modules. | ||||
| | * | Moved all HG1 operations to HGGridConnector.cs and ↵ | Diva Canto | 2009-09-26 | 2 | -23/+29 |
| | | | | | | | | | | | | | | | | | | HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo. Fixed small bugs with hyperlinked regions' map positions. | ||||
| | * | Fixed MapBlocks bug, wrong order of arguments. First version that seems ↵ | Diva Canto | 2009-09-26 | 1 | -7/+1 |
| | | | | | | | | | | | | | | | | | | completely functional. Also fixed the notification of the message server in standalone -- that server doesn't usually exist. | ||||
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-26 | 4 | -13/+23 |
| | |\ | |||||
| | * | | First pass at the heart surgery for grid services. Compiles and runs ↵ | Diva Canto | 2009-09-26 | 6 | -455/+181 |
| | | | | | | | | | | | | | | | | minimally. A few bugs to catch now. | ||||
| * | | | * Adding Scale to EntityBase * Fixing the incorrect initialization of ↵ | John Hurliman | 2009-09-16 | 3 | -16/+36 |
| | | | | | | | | | | | | | | | | EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity | ||||
* | | | | Merge branch '0.6.7-post-fixes' into vehicles | Kitto Flora | 2009-09-30 | 4 | -13/+30 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | * Does a full battery of tests to ensure that the object isn't an attachment ↵ | Teravus Ovares (Dan Olivares) | 2009-09-25 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | before border crossing * Fixes 'Inconsistent Attachment State' when teleporting into another region besides the SW most region slot on a MegaRegion. * Fixes a host of other unintended attachment border cross edge cases that lead to Inconsistent attachment state. | ||||
| * | | | * Fixes teleporting within megaregions on HG enabled regions. You can ↵ | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | teleport around now. (but it still doesn't fix the inconsistent attachment state when teleporting into region slots that are not the south west region on megaregions) | ||||
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-09-25 | 1 | -0/+7 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Moved the property RegionLoginsEnabled from GridComms to the Scene -- not ↵ | Diva Canto | 2009-09-25 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff. | ||||
| * | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-09-25 | 1 | -9/+8 |
| |/ / | |||||
* | | | And another merge issue | Kitto Flora | 2009-09-30 | 1 | -0/+1 |
| | | | |||||
* | | | And another | Kitto Flora | 2009-09-30 | 1 | -1/+1 |
| | | | |||||
* | | | Another small change to avoid later merge conflict | Kitto Flora | 2009-09-30 | 1 | -2/+3 |
| | | | |||||
* | | | Small chaneg to adapt to trunk | Kitto Flora | 2009-09-30 | 1 | -2/+3 |
| | | | |||||
* | | | Commit initial version of KittoFlora's vehicle changes | opensim | 2009-09-30 | 6 | -178/+149 |
|/ / | |||||
* | | Alternate algorithm for fixing avatar capsule tilt (Mantis #2905) | nlin | 2009-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate dynamic capsule wobble. Instead introduce a small, fixed tilt, and allow the tilt to rotate with the avatar while moving; the tilt always faces away from the direction of avatar movement. The rotation while moving should eliminate direction-dependent behavior (e.g. only being able to climb on top of prims from certain directions). Falling animation is still too frequently invoked. Ideally the tilt should be completely eliminated, but doing so currently causes the avatar to fall through the terrain. | ||||
* | | While running a test case I had written to pursue problems with | Alan M Webb | 2009-09-17 | 1 | -113/+152 |
|/ | | | | | | | | | | | | | | | | | | | | llDie() not always completely working, I discovered I was getting a lot (60+ over 6000 iterations of the test case) null pointer exceptions in various physics related checks in SceneObjectPart. It was apparent that the (frequent) checks for PhysActor being non-null is an insufficient protection in a highly asynchronous environment. The null reference exceptions are one example of failure, but it could also happen that a sequence started with one instance of a PhysicsActor might finish with another? Anyway, I have implemented a safer mechanism that should stop the errors. I re-ran my test case with the fix in place, and completed nearly 1000 iterations without a single occurrence. SceneObjectPart is seriously in need of rejigging, if not for this reason, then for its ridiculous size. Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net> | ||||
* | SceneObjectGroup cleanup. Removes the default constructor and unnecessary ↵ | John Hurliman | 2009-09-16 | 4 | -118/+52 |
| | | | | null checks on m_rootPart | ||||
* | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-09-16 | 1 | -1/+2 |
|\ | |||||
| * | updated the IAuthorizationService interface so that a message is passed back ↵ | Rob Smart | 2009-09-16 | 1 | -1/+2 |
| | | | | | | | | and can be displayed at the client when an avatar is denied access to a region | ||||
* | | on iar save/load, let the user know if they put in the wrong password | Justin Clark-Casey (justincc) | 2009-09-16 | 1 | -4/+1 |
|/ | | | | refactor GetUserInfo() to eliminate copypasta | ||||
* | * Use the BeginInvoke methodology instead of the FireAndForget methodology ↵ | Teravus Ovares (Dan Olivares) | 2009-09-13 | 1 | -5/+25 |
| | | | | to try to mitigate a mono assert. Same functionality done a different way. | ||||
* | Change the type value for given folders to -1. Prevents inventory blowups | Melanie | 2009-09-13 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-09-13 | 1 | -7/+7 |
|\ | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-09-13 | 1 | -7/+7 |
| | | |||||
* | | * More comments in the RegionCombinerModule | Teravus Ovares (Dan Olivares) | 2009-09-13 | 2 | -15/+135 |
|/ | | | | | | * Changed the Destination ID to 0 in the TeleportFinish Event (why did we have it as 3?) * Added border based trigger teleports * Fix MakeRootAgent border cross tests for ensuring that the position is inside the region to use the borders to figure out if it's outside the Region | ||||
* | Changed the interface of IAuthorizationService to get less data. | Diva Canto | 2009-09-10 | 1 | -5/+3 |
| | |||||
* | The stubs for an authorization service, at the moment the service will ↵ | Rob Smart | 2009-09-10 | 1 | -1/+32 |
| | | | | always grant access to an avatar entering the region if requested. |