aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-08-305-4/+4
|\
| * BulletSim: update values in OpenSimDefaults.ini to the same as defaults in th...Robert Adams2011-08-301-4/+4
| * BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read.Robert Adams2011-08-304-0/+0
* | Fix bug where attachments were remaining on the avatar after being dropped.Justin Clark-Casey (justincc)2011-08-303-8/+25
|/
* Merge branch 'master' into bulletsimMic Bowman2011-08-308-24/+168
|\
| * Fix bug in persisting saved appearances for npcsJustin Clark-Casey (justincc)2011-08-308-24/+168
* | Use GetMeshKey from PrimitiveBaseShape.Robert Adams2011-08-292-15/+23
* | Merge branch 'master' into bulletsimMic Bowman2011-08-2922-229/+266
|\ \ | |/
| * Move GetMeshKey from buried inside Meshmerizer to a public method on Primitiv...Robert Adams2011-08-282-62/+62
| * Add level of detail specification to optionally reduce the number of vertices...Robert Adams2011-08-282-5/+42
| * Related to #4689 - Adding missing null check for SceneObjectPartMakopoppo2011-08-272-4/+18
| * Stop avatars returning from neighbouring regions from stalling on the border ...Justin Clark-Casey (justincc)2011-08-271-3/+22
| * Eliminate duplicate AttachmentPoint properties by always using the one stored...Justin Clark-Casey (justincc)2011-08-274-44/+41
| * refactor: camel case AttachmentPoint method arg as per code standardsJustin Clark-Casey (justincc)2011-08-271-4/+4
| * refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid poin...Justin Clark-Casey (justincc)2011-08-2716-113/+83
* | BulletSim: add mesh representation. Use meshes for static objects and switch ...Robert Adams2011-08-267-130/+231
* | Merge branch 'master' into bulletsimMic Bowman2011-08-2637-580/+1017
|\ \ | |/
| * refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatarJustin Clark-Casey (justincc)2011-08-267-27/+26
| * refactor: move SOG.DetachToGround() to AttachmentsModule.DetachSceneObjectToG...Justin Clark-Casey (justincc)2011-08-262-41/+35
| * refactor: simplify DetachSingleAttachmentToGround() by retrieving the scene o...Justin Clark-Casey (justincc)2011-08-262-11/+12
| * refactor: remove common presence set up in attachments testsJustin Clark-Casey (justincc)2011-08-261-32/+38
| * comment out verbose test logging from last commitJustin Clark-Casey (justincc)2011-08-261-1/+1
| * add regression test for detaching an attachment to the sceneJustin Clark-Casey (justincc)2011-08-261-0/+33
| * refactor: move sog.DetachToInventoryPrep() into AttachmentsModule.DetachSingl...Justin Clark-Casey (justincc)2011-08-263-36/+23
| * Downgrade warning about not saving unchanged attachment to debug instead, and...Justin Clark-Casey (justincc)2011-08-261-1/+4
| * Fix a very recent regression from llAttachToAvatar() fix where I accidentally...Justin Clark-Casey (justincc)2011-08-261-5/+1
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2011-08-252-51/+111
| |\
| | * llSetPrimitiveParams correct prim hollow for cases where limit should be 70%.Micheil Merlin2011-08-252-51/+111
| * | Remove forcing of phantom on ground attached objects - attachments can be bot...Justin Clark-Casey (justincc)2011-08-243-7/+2
| * | remove pointless IsDeleted check on SP.RezAttachments()Justin Clark-Casey (justincc)2011-08-241-3/+0
| * | refactor: simplify EntityBase.IsDeleted propertyJustin Clark-Casey (justincc)2011-08-243-10/+5
| * | extend initial rez regression test to check that attachment is phantomJustin Clark-Casey (justincc)2011-08-241-9/+14
| * | Make objects attached from the ground phantomJustin Clark-Casey (justincc)2011-08-242-2/+12
| * | add SOG helper properties IsPhantom, IsTemporary, etc. to improve code readab...Justin Clark-Casey (justincc)2011-08-241-20/+46
| * | return InventoryItemBase from AddSceneObjectAsAttachment()Justin Clark-Casey (justincc)2011-08-241-8/+4
| * | refactor: move Scene.Inventory.attachObjectAssetStore() into AttachmentsModul...Justin Clark-Casey (justincc)2011-08-242-86/+100
| * | get rid of pointless grp null check in attachObjectAssetStore()Justin Clark-Casey (justincc)2011-08-241-73/+69
| * | minor: remove hardcoded region numbers with the region size constant and a cu...Justin Clark-Casey (justincc)2011-08-241-2/+2
| * | refactor: remove pointless AgentId argument from attachObjectAssetStore()Justin Clark-Casey (justincc)2011-08-242-2/+2
| * | add TestAddAttachmentFromGround() regression testJustin Clark-Casey (justincc)2011-08-242-2/+32
| |/
| * Fix llAttachToAvatar()Justin Clark-Casey (justincc)2011-08-246-24/+80
| * rename AttachmentsModule.ShowDetachInUserInventory() to DetachSingleAttachmen...Justin Clark-Casey (justincc)2011-08-234-23/+14
| * remove mono compiler warningsJustin Clark-Casey (justincc)2011-08-239-16/+4
| * replace TestRemoveAttachments() with a more thorough TestRemoveAttachment()Justin Clark-Casey (justincc)2011-08-231-51/+27
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-08-231-3/+10
| |\
| | * Protect a check for default texture entry when setting alpha values. ApparentlyMic Bowman2011-08-231-3/+10
| * | replace old TestAddAttachments() with a more thorough TestAddAttachment()Justin Clark-Casey (justincc)2011-08-231-7/+28
| |/
| * Remove pointless contains check in ScenePresence.RemoveAttachment()Justin Clark-Casey (justincc)2011-08-231-6/+1
| * If an object failed to attach due to an exception, then try and detach it fro...Justin Clark-Casey (justincc)2011-08-231-1/+2
| * If an attachment fails, then start logging the exception for now, in order to...Justin Clark-Casey (justincc)2011-08-223-61/+84