aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'ubitworkmaster'Melanie Thielker2014-07-205-13/+11
| |\ \ \
| | * | | replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-205-13/+11
| | | | | | | | | | | | | | | | | | | | artifacts
| * | | | Fix duplicate attach message being sent to objects picked up from the groundMelanie Thielker2014-07-201-1/+4
| |/ / /
| * | | Fix coalesced objects not showing up as "piles" of prims (AVN only bug)Melanie Thielker2014-07-201-4/+4
| | | |
| * | | Merge branch 'ubitworkmaster'Melanie Thielker2014-07-190-0/+0
| |\ \ \
| | * | | refix originalPositions[]UbitUmarov2014-07-191-1/+1
| | | | |
| * | | | Fix taking objectsMelanie Thielker2014-07-191-1/+1
| |/ / /
| * | | Merge branch 'avination-current'Melanie Thielker2014-07-1918-1516/+700
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| | * | revert to capsule representation of avatar colliderUbitUmarov2014-07-191-297/+28
| | | |
| | * | reduce avatar hover in basic ode pluginUbitUmarov2014-07-181-1/+1
| | | |
| | * | fix Xengine script instance loadUbitUmarov2014-07-181-7/+6
| | | |
| | * | Merge branch 'avination-current' into ubitworkUbitUmarov2014-07-1653-472/+954
| | |\ \
| | | * \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵UbitUmarov2014-07-1621-91/+256
| | | |\ \ | | | | | | | | | | | | | | | | | | into avination-current
| | | * \ \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵UbitUmarov2013-09-1936-381/+698
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into avination-current
| | * | \ \ \ Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-083-320/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵UbitUmarov2013-06-083-320/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into avination-current
| | * | | | | | add indexes for new visual parameters shape_hover andUbitUmarov2013-06-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for now
| | * | | | | | try to suspend and resume keyframes on copy to inventory to take copyUbitUmarov2013-06-061-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't destroy state
| | * | | | | | Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-061-15/+64
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | keyframe: add more locks, change timming stop, added Suspend and resumeUbitUmarov2013-06-061-15/+64
| | | | | | | |
| | * | | | | | Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-064-18/+43
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge branch 'avination-current' into ubitworkUbitUmarov2013-05-314-7/+7
| | |\ \ \ \ \ \
| | * | | | | | | retouch prim stopped condition testUbitUmarov2013-05-291-3/+3
| | | | | | | | |
| | * | | | | | | removed spurius ref to ode.dll from odeapiUbitUmarov2013-05-291-1/+1
| | | | | | | | |
| | * | | | | | | correction to previus comment: all parameters but gravity modifier haveUbitUmarov2013-05-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efect on all prims.
| | * | | | | | | let gravity modifier, friction, restitution and density changes be appliedUbitUmarov2013-05-292-6/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to prim. Only have efect on root prim. Density doesn't get effect imediatly, only on next change of size or shape. density change implies a full body rebuild to be done later, after reducing the number of sets sop does. Other parameters should work. **** mainly untested ***
| | * | | | | | | make sure friction slip parameters are zero ( or other value ) and notUbitUmarov2013-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default cmf
| | * | | | | | | missing fileUbitUmarov2013-05-291-0/+5
| | | | | | | | |
| | * | | | | | | missing filesUbitUmarov2013-05-292-5/+6
| | | | | | | | |
| | * | | | | | | *** DANGER TESTING **** changed prims mesh generation hopefully removingUbitUmarov2013-05-299-1178/+503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spurius faces. CHanged several aspects. Fixed prims inertia that was too low, still using box as model. Increased number of quickstep SOR iterations to 15. Keep it 15 even on heavy load ( will only jump simulation time).
| * | | | | | | | fix attachmentsUbitUmarov2014-07-191-7/+9
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-21663-40549/+83928
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2014-01-2859-1643/+2129
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2014-01-2816-101/+265
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | | | | | | | Remove the core module extra profile settings support carried in with the latestMelanie2014-01-053-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patches. We don't need it.
| | * | | | | | | | | | Intermediate commit. Sill errors.Melanie2014-01-0536-8803/+10755
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * \ \ \ \ \ \ \ \ \ \ Merge commit '92aad6f1bb45974927fa43d6fd30f98337dee3f0' into careminsterMelanie2014-01-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge commit '5b73b9c4a85335ba837280688b903fef44be8f35' into careminsterMelanie2014-01-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '3df8990e6ff6a5293b425e906cd381da9e0424a5' into careminsterMelanie2014-01-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '97934e00e667b6f432340a54671221a970a048d7' into careminsterMelanie2014-01-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminsterMelanie2014-01-051-2/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Revert "Add support for user preferences (im via email)"Melanie2013-12-0714-297/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
| | * | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-12-0717-48/+305
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-12-0713-7904/+8421
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-2376-9536/+10619
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-0834-7618/+7968
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-0380-259/+17602
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-066-6/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster
| | | * | | | | | | | | | | | | | | | | | | | | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-054-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of careminster:/var/git/careminsterteravus2013-10-0485-872/+2997
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-03-20 05:23:25 +0000