Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix a regression to GetSittingAvatars(). Return List<ScenePresence> once more. | Kevin Cozens | 2015-09-21 | 1 | -14/+9 |
| | |||||
* | add missing llSetVelocity stub | UbitUmarov | 2015-09-08 | 1 | -0/+6 |
| | |||||
* | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1 | ||||
| * | More namespace and dll name changes. Still no functional changes. | Diva Canto | 2015-08-30 | 1 | -1/+1 |
| | | |||||
| * | Renamed the namespaces too | Diva Canto | 2015-08-30 | 1 | -1/+1 |
| | | |||||
* | | minor change, add a lock we had at avn | UbitUmarov | 2015-09-06 | 1 | -2/+4 |
| | | |||||
* | | add missing stub for llSetVelocity | UbitUmarov | 2015-09-06 | 1 | -0/+1 |
| | | |||||
* | | fix CM_api compile error | UbitUmarov | 2015-09-03 | 1 | -3/+3 |
| | | |||||
* | | minor clean | UbitUmarov | 2015-09-03 | 1 | -48/+0 |
| | | |||||
* | | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 4 | -1069/+165 |
| | | |||||
* | | bad merge? | UbitUmarov | 2015-09-01 | 17 | -876/+3581 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'mbworkvar2' into ubitvar | UbitUmarov | 2015-08-19 | 3 | -18/+19 |
| |\ | |||||
| | * | varregion: any conversions of use of Constants.RegionSize converted into | Robert Adams | 2015-03-29 | 3 | -18/+19 |
| | | | | | | | | | | | | Util.cs routines to convert region coords to and from world coords or handles. | ||||
| * | | Add WhiteCore's LL Json functions | Melanie Thielker | 2015-05-26 | 4 | -0/+279 |
| | | | |||||
| * | | Taking a reference to the value collection is not thread safe. Change this | Melanie Thielker | 2015-03-23 | 1 | -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 Thielker | 2014-11-21 | 1 | -5/+7 |
| |\ | |||||
| | * | some steps to rez center or root of prim inventory object at requested | UbitUmarov | 2014-11-19 | 1 | -5/+7 |
| | | | | | | | | | | | | position ( does nothing diferent still ) | ||||
| * | | Remove braindead "fix" that messed up intersim scripted giving. | Melanie Thielker | 2014-11-21 | 1 | -1/+14 |
| |/ | |||||
| * | dont do recoil on llRezObject called from attachments, as seem to happen | UbitUmarov | 2014-11-18 | 1 | -8/+13 |
| | | | | | | | | at sl | ||||
| * | n llPushObject if pushed object is a avatar use its rotation, not pusher | UbitUmarov | 2014-11-14 | 1 | -1/+2 |
| | | | | | | | | rotation | ||||
| * | remove LockItemsForRead(false) without previus call with true | UbitUmarov | 2014-09-21 | 2 | -3/+1 |
| | | |||||
| * | *TEST* add movement states SIT and SITGROUND. ScenePresence on SIT, | UbitUmarov | 2014-09-10 | 1 | -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 case | UbitUmarov | 2014-09-09 | 1 | -1/+1 |
| | | |||||
| * | remove the check animState == anim for same reasons | UbitUmarov | 2014-09-09 | 1 | -16/+10 |
| | | |||||
| * | look for animation on part inventory before default animations, so | UbitUmarov | 2014-09-09 | 1 | -4/+7 |
| | | | | | | | | | | user can use same name. Search directly on default animations using uppercase. | ||||
| * | Plumb the rest of the serverside AO | Melanie Thielker | 2014-09-09 | 3 | -0/+108 |
| | | |||||
| * | Add some case magic and send an anim pack when an override is set | Melanie Thielker | 2014-09-09 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into ubitworkmaster | UbitUmarov | 2014-09-09 | 1 | -4/+19 |
| |\ | |||||
| | * | Add perms check | Melanie Thielker | 2014-09-09 | 1 | -0/+3 |
| | | | |||||
| | * | Also check standard anim names | Melanie Thielker | 2014-09-09 | 1 | -4/+16 |
| | | | |||||
| * | | Merge branch 'master' into ubitworkmaster | UbitUmarov | 2014-09-09 | 4 | -1/+52 |
| |\ \ | | |/ | |||||
| | * | make PERMISSION_OVERRIDE_ANIMATIONS implicit for attachments | Melanie Thielker | 2014-09-09 | 1 | -1/+2 |
| | | | |||||
| | * | Plumb llSetAnimationOverride | Melanie Thielker | 2014-09-09 | 4 | -0/+50 |
| | | | |||||
| * | | limit number of prims on physical objects. Not all cases covered still | UbitUmarov | 2014-09-08 | 1 | -0/+11 |
| |/ | |||||
| * | Merge branch 'ubitworkmaster' | Melanie Thielker | 2014-08-11 | 1 | -1/+10 |
| |\ | |||||
| | * | make sensors detect sitting avatars also by the distance to the root prim | UbitUmarov | 2014-08-10 | 1 | -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 type | Melanie Thielker | 2014-08-10 | 1 | -2/+10 |
| |/ | | | | | | | to be found. | ||||
| * | change how sounds work. May be bad.. needs testing | UbitUmarov | 2014-07-27 | 1 | -5/+6 |
| | | |||||
| * | Remove some already commented lines | Melanie Thielker | 2014-07-20 | 1 | -11/+0 |
| | | |||||
| * | Fix LSL portions of sit positioning | Melanie Thielker | 2014-07-20 | 1 | -36/+12 |
| | | |||||
| * | replace old Attachoffset by AttachedPos. Comented out possible merge | UbitUmarov | 2014-07-20 | 1 | -1/+1 |
| | | | | | | | | artifacts | ||||
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 12 | -249/+460 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 4 | -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 careminster | Melanie | 2014-01-28 | 1 | -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 | ||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2013-11-23 | 2 | -3/+29 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat | ||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-11-08 | 2 | -1/+18 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-11-03 | 1 | -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' into careminster | Melanie | 2013-10-06 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-10-04 | 2 | -5/+7 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master' into careminster | Melanie | 2013-08-07 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs |