Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 12 | -85/+365 |
|\ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-04-24 | 10 | -77/+358 |
| |\ | |||||
| | * | BulletSim: partial addition of BSShape class code preparing for | Robert Adams | 2013-04-24 | 2 | -52/+191 |
| | | | | | | | | | | | | | | | different physical mesh representations (simplified convex meshes) and avatar mesh. | ||||
| | * | BulletSim: update DLLs and SOs to they have no dependencies on newer | Robert Adams | 2013-04-24 | 3 | -0/+44 |
| | | | | | | | | | | | | | | | glibc (2.14) since that is not yet in some Linux distributions. Add unmanaged API calls and code for creating single convex hull shapes. | ||||
| | * | BulletSim: improve avatar stair walking up. Add more parameters to control force | Robert Adams | 2013-04-23 | 5 | -25/+123 |
| | | | | | | | | | | | | | | | of both position change and up force that move avatars over barrier. Default parameters are for steps up to 0.5m in height. | ||||
| * | | Bug fix: compare tolower. This should fix the issue where HG visitors ↵ | Diva Canto | 2013-04-24 | 1 | -1/+1 |
| |/ | | | | | | | currently in the region were not being found by the avatar picker window. | ||||
| * | Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if ↵ | Justin Clark-Casey (justincc) | 2013-04-23 | 1 | -2/+4 |
| | | | | | | | | | | | | | | any number of avatars other than 1 was in the region. I don't know how well the rest of ConiergeModule works since I've practically never looked at this code. Addresses http://opensimulator.org/mantis/view.php?id=6605 | ||||
| * | BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's ↵ | Robert Adams | 2013-04-22 | 1 | -5/+2 |
| | | | | | | | | check for an object being linked into the world does not work for Bullet's ghost objects so BulletSim was deleting the object while it was still linked into the physical world structures. | ||||
| * | Allow callers to set the invoice parameter for GenericMessage | Melanie | 2013-04-22 | 4 | -8/+18 |
| | | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-04-22 | 29 | -900/+2135 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2013-04-21 | 3 | -12/+620 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML | ||||
| | * | Materials persistence via SceneObjectPart.dynAttrs. This appears to work ↵ | dahlia | 2013-04-20 | 1 | -8/+154 |
| | | | | | | | | | | | | across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving. | ||||
| | * | handle PUT verb for RenderMaterials Cap | dahlia | 2013-04-20 | 1 | -1/+5 |
| | | | |||||
| | * | RenderMaterials POST Cap now return material entries when invoked with an ↵ | dahlia | 2013-04-19 | 1 | -61/+108 |
| | | | | | | | | | | | | OSDArray of MaterialIDs | ||||
| | * | Materials-capable viewers send ImageUpdate packets when updating materials ↵ | dahlia | 2013-04-19 | 1 | -11/+35 |
| | | | | | | | | | | | | that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed. | ||||
| | * | remove default parameter value that apparently mono cant handle | dahlia | 2013-04-18 | 1 | -1/+1 |
| | | | |||||
| | * | Initial experimental support for materials-capable viewers. This is in a ↵ | dahlia | 2013-04-18 | 1 | -0/+382 |
| | | | | | | | | | | | | very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet. | ||||
| | * | amend previous commit, a line was left out | dahlia | 2013-04-17 | 1 | -0/+1 |
| | | | |||||
| | * | Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential ↵ | dahlia | 2013-04-17 | 1 | -2/+6 |
| | | | | | | | | | | | | crash with Server-side baking enabled viewers | ||||
| | * | Allow changes to TextureEntry to propagate to viewers when MaterialID changes | dahlia | 2013-04-17 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-04-16 | 3 | -8/+14 |
| |\ \ | | |/ | |||||
| | * | refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing ↵ | Justin Clark-Casey (justincc) | 2013-04-16 | 3 | -8/+14 |
| | | | | | | | | | | | | | | | | | | | | | Stop(). This was an undocumented interface which I think was for long defunct region load balancing experiments. Also adds method doc for some IClientNetworkServer methods. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-04-10 | 23 | -880/+1501 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | * | BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. | Robert Adams | 2013-04-09 | 3 | -6/+18 |
| | | | |||||
| | * | BulletSim: some formatting changes. | Robert Adams | 2013-04-09 | 1 | -10/+17 |
| | | | |||||
| | * | Another algorithm for AngularVerticalAttraction. This one Takes into account ↵ | Vegaslon | 2013-04-09 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | all rotations before it and makes the corrections more close to the time that sl does. Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| | * | BulletSim: add Bullet HACD library invocation. Turned off by default as not | Robert Adams | 2013-04-09 | 3 | -94/+183 |
| | | | | | | | | | | | | totally debugged. Updated DLLs and SOs with more debugged HACD library code. | ||||
| | * | BulletSim: fix problem where large sets of mega-regions weren't registering | Robert Adams | 2013-04-09 | 1 | -3/+3 |
| | | | | | | | | | | | | all the terrain with the base region. | ||||
| | * | minor: fix mono compiler warning in ScriptsHttpRequests.cs | Justin Clark-Casey (justincc) | 2013-04-10 | 1 | -1/+0 |
| | | | |||||
| | * | minor: remove mono compiler warnings in InventoryAccessModule | Justin Clark-Casey (justincc) | 2013-04-10 | 1 | -3/+2 |
| | | | |||||
| | * | Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 ↵ | Justin Clark-Casey (justincc) | 2013-04-09 | 1 | -1/+1 |
| | | | | | | | | | | | | 02:34:51 2013) | ||||
| | * | minor: Log an exception if we aren't able to delete a script state file ↵ | Justin Clark-Casey (justincc) | 2013-04-09 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | rather than simply ignoring it. This should never normally happen but if it does then it can be valuable diagonstic information. | ||||
| | * | BulletSim: moving comments around. No functional change. | Robert Adams | 2013-04-08 | 3 | -10/+11 |
| | | | |||||
| | * | BulletSim: clean up actor code so routines use the same coding pattern. | Robert Adams | 2013-04-08 | 10 | -123/+137 |
| | | | | | | | | | | | | Fix a few enabling problems. | ||||
| | * | BulletSim: complete movement of physical object action code out of the | Robert Adams | 2013-04-08 | 11 | -636/+1078 |
| | | | | | | | | | | | | | | | physical object and into actors for setForce, setTorque, hover, lock axis and avatar move. | ||||
| | * | Fix taking (and rezzing) of coalesced objects in the non-root subregions of ↵ | Justin Clark-Casey (justincc) | 2013-04-06 | 4 | -53/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | megaregions. This fixes the combined bounding box location for regions bigger than 256x256. It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead. It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region. Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks! | ||||
| | * | When rezzing a coalesced object, check adjust position of all components. | Justin Clark-Casey (justincc) | 2013-04-06 | 1 | -20/+27 |
| | | | |||||
| | * | refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more ↵ | Justin Clark-Casey (justincc) | 2013-04-04 | 1 | -10/+4 |
| | | | | | | | | | | | | simply iterate through pending requests without unnecessary checks. | ||||
| | * | Fix bug where outstanding llHTTPRequests for scripts were not being aborted ↵ | Justin Clark-Casey (justincc) | 2013-04-04 | 3 | -32/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | when they were deleted. This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID. This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself. This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed. | ||||
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-04-22 | 18 | -245/+549 |
|\ \ \ | |/ / | |||||
| * | | Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster | Melanie | 2013-04-04 | 2 | -14/+3 |
| |\ \ | | |/ | |||||
| | * | minor: Stop falsely logging that a teleport was being aborted on client ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -3/+1 |
| | | | | | | | | | | | | logout even when no teleport was active. | ||||
| | * | Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -11/+2 |
| | | | | | | | | | | | | values could be returned if the sit orientation was changed whilst the property was being fetched. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 1 | -5/+6 |
| |\ \ | | |/ | |||||
| | * | Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -5/+6 |
| | | | | | | | | | | | | than one that could change whilst the method is being executed. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | fix minor race condition in SOP.SitTargetPositionLL where inconsistency ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | could occur if the sit target position changed whilst the property was fetched | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 17 | -225/+539 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | minor: Make SOP.UpdateOffset() more consistent by checking against the same ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -7/+7 |
| | | | | | | | | | | | | old OffsetPosition rather than one which may vary if it simultaneously changes. | ||||
| | * | Fix minor race condition where SOP.GetGeometricCenter() and ↵ | Justin Clark-Casey (justincc) | 2013-04-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running No need to create new Vector3s since these are structs. |