aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* seems to compile ( tests comented out)UbitUmarov2015-09-026-1235/+168
|
* bad merge?UbitUmarov2015-09-0120-941/+3823
|\
| * add missing culture format on lslvector toStringUbitUmarov2015-08-231-3/+3
| |
| * Merge branch 'mbworkvar2' into ubitvarUbitUmarov2015-08-193-18/+19
| |\
| | * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-293-18/+19
| | | | | | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * | Fix adding a scalar to the end of a listMelanie Thielker2015-08-191-2/+5
| | |
| * | Add WhiteCore's LL Json functionsMelanie Thielker2015-05-264-0/+279
| | |
| * | Taking a reference to the value collection is not thread safe. Change thisMelanie Thielker2015-03-231-3/+3
| |/ | | | | | | | | to create a shallow copy instead and then iterate it's values to avoid the "out of sync" error.
| * Merge branch 'ubitworkmaster'Melanie Thielker2014-11-211-5/+7
| |\
| | * some steps to rez center or root of prim inventory object at requestedUbitUmarov2014-11-191-5/+7
| | | | | | | | | | | | position ( does nothing diferent still )
| * | Remove braindead "fix" that messed up intersim scripted giving.Melanie Thielker2014-11-211-1/+14
| |/
| * dont do recoil on llRezObject called from attachments, as seem to happenUbitUmarov2014-11-181-8/+13
| | | | | | | | at sl
| * n llPushObject if pushed object is a avatar use its rotation, not pusherUbitUmarov2014-11-141-1/+2
| | | | | | | | rotation
| * remove LockItemsForRead(false) without previus call with trueUbitUmarov2014-09-212-3/+1
| |
| * *TEST* add movement states SIT and SITGROUND. ScenePresence on SIT,UbitUmarov2014-09-101-13/+17
| | | | | | | | | | SITGROUND or STAND, sets directly the state, and desired sitAnimation for default sits
| * it its a default ( internal ) animation return its name in lower caseUbitUmarov2014-09-091-1/+1
| |
| * remove the check animState == anim for same reasonsUbitUmarov2014-09-091-16/+10
| |
| * look for animation on part inventory before default animations, soUbitUmarov2014-09-091-4/+7
| | | | | | | | | | user can use same name. Search directly on default animations using uppercase.
| * Plumb the rest of the serverside AOMelanie Thielker2014-09-093-0/+108
| |
| * Add some case magic and send an anim pack when an override is setMelanie Thielker2014-09-091-1/+1
| |
| * Merge branch 'master' into ubitworkmasterUbitUmarov2014-09-091-4/+19
| |\
| | * Add perms checkMelanie Thielker2014-09-091-0/+3
| | |
| | * Also check standard anim namesMelanie Thielker2014-09-091-4/+16
| | |
| * | Merge branch 'master' into ubitworkmasterUbitUmarov2014-09-094-1/+52
| |\ \ | | |/
| | * make PERMISSION_OVERRIDE_ANIMATIONS implicit for attachmentsMelanie Thielker2014-09-091-1/+2
| | |
| | * Plumb llSetAnimationOverrideMelanie Thielker2014-09-094-0/+50
| | |
| * | limit number of prims on physical objects. Not all cases covered stillUbitUmarov2014-09-081-0/+11
| |/
| * Merge branch 'ubitworkmaster'Melanie Thielker2014-08-111-1/+10
| |\
| | * make sensors detect sitting avatars also by the distance to the root primUbitUmarov2014-08-101-1/+10
| | | | | | | | | | | | of the object as sl does (as sl avatar needs to be in the arc)
| * | LSL llListFindList fix: check types as well as content. Items must be same typeMelanie Thielker2014-08-101-2/+10
| |/ | | | | | | to be found.
| * change how sounds work. May be bad.. needs testingUbitUmarov2014-07-271-5/+6
| |
| * Remove some already commented linesMelanie Thielker2014-07-201-11/+0
| |
| * Fix LSL portions of sit positioningMelanie Thielker2014-07-201-36/+12
| |
| * replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-201-1/+1
| | | | | | | | artifacts
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2126-8499/+11531
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * Merge branch 'master' into careminsterMelanie2014-01-284-12/+68
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-281-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ Intermediate commit. Sill errors.Melanie2014-01-053-8624/+10024
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into careminsterMelanie2013-12-072-7784/+8165
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-235-8235/+8866
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-086-7472/+7710
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-031-27/+22
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster
| | | * \ \ \ \ \ \ \ Merge branch 'master' of careminster:/var/git/careminsterteravus2013-10-044-242/+407
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-09-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work. (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)
| | * | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-063-3/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-044-242/+407
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-09-161-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| | * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-08-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-072-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
generated by cgit v1.1 at 2024-12-14 08:11:00 +0000