aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-250-0/+0
|\
| * Commit Avination's God Kick feature.Melanie2013-04-251-62/+137
| |
* | Merge branch 'master' into careminsterMelanie2013-04-250-0/+0
|\ \ | |/
| * Add Avination's support for parcel eject and freezeMelanie2013-04-252-15/+110
| |
* | Merge branch 'master' into careminsterMelanie2013-04-2517-85/+365
|\ \ | |/
| * BulletSim: version of libBulletSim.so for 32 bit systems that doesn'tRobert Adams2013-04-241-0/+0
| | | | | | | | crash on startup. Doesn't yet solve the new glibcxx dependencies.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-04-2414-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-247-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.
| * revert CSJ2K.dll to version in use prior to commit ↵dahlia2013-04-231-0/+0
| | | | | | | | d4fa2c69ed2895dcab76e0df1b26252246883c07
| * 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' into careminsterMelanie2013-04-222-9/+10
|\ \ | |/
| * Clean up unused config and config comments.Diva Canto2013-04-212-9/+10
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-2253-19182/+20056
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-2116-18176/+18431
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-04-212-3/+3
| | |\
| | | * Fix spellingBlueWall2013-04-201-2/+2
| | | |
| | | * Small fix to prebuild xml for building with mono toolsBlueWall2013-04-201-1/+1
| | | |
| | * | 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-182-0/+383
| | | | | | | | | | | | 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
| | |
| | * update libomv to git master which adds support for MaterialID in TextureEntrydahlia2013-04-1711-15459/+16598
| | |
| * | 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-1034-998/+1611
| |\ \ | | |/ | | | | | | | | | | | | | | | 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-097-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)
| | * Add more notes to async_call_method relating to UnsafeQueueUserWorkItemJustin Clark-Casey (justincc)2013-04-091-0/+5
| | | | | | | | | | | | | | | UnsafeQueueUserWorkItem is so called because it allows the calling code to escalate its security privileges. However, since we must already trust this code anyway in OpenSimulator this is not an issue.
| | * 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-0916-828/+1261
| | |\
| | | * BulletSim: Add dylib for BulletSim and add he who figured out building BulletSimRobert Adams2013-04-082-0/+1
| | | | | | | | | | | | | | | | on a Mac to the CONTRIBUTORS file.
| | | * fixed bullet config for osxJon Cundill2013-04-081-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| | | * BulletSim: moving comments around. No functional change.Robert Adams2013-04-083-10/+11
| | | |
generated by cgit v1.1 at 2024-12-21 15:54:03 +0000