aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-2512-85/+365
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-04-2410-77/+358
| |\
| | * BulletSim: partial addition of BSShape class code preparing forRobert Adams2013-04-242-52/+191
| | | | | | | | | | | | | | | different physical mesh representations (simplified convex meshes) and avatar mesh.
| | * BulletSim: update DLLs and SOs to they have no dependencies on newerRobert Adams2013-04-243-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 forceRobert Adams2013-04-235-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 Canto2013-04-241-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-231-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 Adams2013-04-221-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 GenericMessageMelanie2013-04-226-12/+22
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-2232-1018/+2237
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-213-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 ↵dahlia2013-04-201-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 Capdahlia2013-04-201-1/+5
| | |
| | * RenderMaterials POST Cap now return material entries when invoked with an ↵dahlia2013-04-191-61/+108
| | | | | | | | | | | | OSDArray of MaterialIDs
| | * Materials-capable viewers send ImageUpdate packets when updating materials ↵dahlia2013-04-191-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 handledahlia2013-04-181-1/+1
| | |
| | * Initial experimental support for materials-capable viewers. This is in a ↵dahlia2013-04-181-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 outdahlia2013-04-171-0/+1
| | |
| | * Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential ↵dahlia2013-04-171-2/+6
| | | | | | | | | | | | crash with Server-side baking enabled viewers
| | * Allow changes to TextureEntry to propagate to viewers when MaterialID changesdahlia2013-04-171-0/+2
| | |
| * | Merge branch 'master' into careminsterMelanie2013-04-163-8/+14
| |\ \ | | |/
| | * refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing ↵Justin Clark-Casey (justincc)2013-04-163-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 careminsterMelanie2013-04-1026-998/+1603
| |\ \ | | |/ | | | | | | | | | | | | | | | 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 Adams2013-04-093-6/+18
| | |
| | * BulletSim: some formatting changes.Robert Adams2013-04-091-10/+17
| | |
| | * Another algorithm for AngularVerticalAttraction. This one Takes into account ↵Vegaslon2013-04-091-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 notRobert Adams2013-04-093-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 registeringRobert Adams2013-04-091-3/+3
| | | | | | | | | | | | all the terrain with the base region.
| | * minor: fix mono compiler warning in ScriptsHttpRequests.csJustin Clark-Casey (justincc)2013-04-101-1/+0
| | |
| | * minor: remove mono compiler warnings in InventoryAccessModuleJustin Clark-Casey (justincc)2013-04-101-3/+2
| | |
| | * minor: Make exceptions thrown by MySQLAssetData more consistent.Justin Clark-Casey (justincc)2013-04-101-10/+19
| | |
| | * Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 ↵Justin Clark-Casey (justincc)2013-04-091-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-091-1/+6
| | | | | | | | | | | | | | | | | | rather than simply ignoring it. This should never normally happen but if it does then it can be valuable diagonstic information.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-04-0913-828/+1258
| | |\
| | | * BulletSim: moving comments around. No functional change.Robert Adams2013-04-083-10/+11
| | | |
| | | * BulletSim: clean up actor code so routines use the same coding pattern.Robert Adams2013-04-0810-123/+137
| | | | | | | | | | | | | | | | Fix a few enabling problems.
| | | * BulletSim: complete movement of physical object action code out of theRobert Adams2013-04-0811-636/+1078
| | | | | | | | | | | | | | | | | | | | physical object and into actors for setForce, setTorque, hover, lock axis and avatar move.
| | | * Optimize the number of Simian calls to get the initial presenceMic Bowman2013-04-071-110/+83
| | | | | | | | | | | | | | | | | | | | | | | | information for the friends list. This is a pretty big performance improvement on login. Note that you must upgrade simian to incorporate the corresponding GetSessions call.
| | * | If OpenSimulator is writing a PID file and finds the file already present on ↵Justin Clark-Casey (justincc)2013-04-091-0/+5
| | |/ | | | | | | | | | | | | | | | startup, logging an error since this is commonly due to an unclean shutdown. Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
| | * Fix taking (and rezzing) of coalesced objects in the non-root subregions of ↵Justin Clark-Casey (justincc)2013-04-064-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-061-20/+27
| | |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-2221-253/+557
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2013-04-051-1/+1
| |\ \ | | |/
| | * * In between the fog, a moment of clarity. This fixes mantis 6570teravus2013-04-041-1/+1
| | |
| * | Merge branch 'master' into careminsterMelanie2013-04-041-1/+1
| |\ \ | | |/
| | * Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last ↵Justin Clark-Casey (justincc)2013-04-041-1/+1
| | | | | | | | | | | | | | | | | | user login time rather than serializing the DateTime directly which generates a set of unexpected fields. lastlogin return is in unix timestamp format.
| | * refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more ↵Justin Clark-Casey (justincc)2013-04-041-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-043-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 commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminsterMelanie2013-04-042-14/+3
| |\ \ | | |/
| | * minor: Stop falsely logging that a teleport was being aborted on client ↵Justin Clark-Casey (justincc)2013-04-031-3/+1
| | | | | | | | | | | | logout even when no teleport was active.
generated by cgit v1.1 at 2024-12-15 23:28:00 +0000