aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-141-5/+30
|\
| * Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()Justin Clark-Casey (justincc)2012-04-141-1/+3
| |
| * minor: make test names consistentJustin Clark-Casey (justincc)2012-04-141-1/+1
| |
| * refactor: move common init code into SetUp() in SceneObjectSpatialTestsJustin Clark-Casey (justincc)2012-04-141-8/+13
| |
| * refactor: put SOG position test in a separate TestSceneObjectGroupPosition()Justin Clark-Casey (justincc)2012-04-141-1/+17
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-145-12/+62
| |\
| * | Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPositionJustin Clark-Casey (justincc)2012-04-141-0/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-148-95/+250
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-04-141-0/+1
| |\ \
| | * | Add Talun to the CONTRIBUTORS.txt, Thank you for the great patchesnebadon2012-04-131-0/+1
| | | | | | | | | | | | | | | | Talun
| * | | Correct whitespace error introduced by previous commitMelanie2012-04-141-1/+1
| |/ /
| * | Missing or unimplemented LSL memory functions.Talun2012-04-134-13/+62
| |/ | | | | | | | | | | Implemented to behave as if scripts were LSO. Signed-off-by: nebadon <michael@osgrid.org>
| * Add very basic TestGetRootPartPosition() testJustin Clark-Casey (justincc)2012-04-141-0/+65
| |
| * Added ability to exclude inventory items or folders when saving IAR files.Kevin Cozens2012-04-132-84/+128
| |
* | Merge branch 'master' into careminsterMelanie2012-04-131-37/+26
|\ \ | |/
| * Change threat level of osNpcStopMoveToTarget from Low to High to match other ↵Justin Clark-Casey (justincc)2012-04-131-1/+1
| | | | | | | | | | | | NPC functions, and change OSSL permissions name to osNpcStopMoveToTarget instead of osNpcStopMoveTo Thanks to Oren Hurvitz for pointing out these mistakes.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-1317-52/+277
| |\
| * | Remove hardcoded god requirement from osSetRegionWaterHeight, ↵Justin Clark-Casey (justincc)2012-04-131-36/+25
| | | | | | | | | | | | | | | | | | | | | | | | osSetRegionSunSettings and, osSetEstateSunSettings no matter the threat level. Change threat level on osSetRegionSunSettings and osSetEstateSunSettings from nuisance to high to match similar functions. If you had enabled these functions but had relied on the hardcoded god check in the code, then please adjust your OSSL permissions config. Thanks to Oren Hurvitz for pointing this out.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-139-351/+541
|\ \ \ | | | | | | | | | | | | careminster
| * | | make llGetGeometricCenter() work as in current SL. Now this is not real geom ↵UbitUmarov2012-04-092-10/+49
| | | | | | | | | | | | | | | | center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine.
| * | | chODE and ubitODE always return prim mass (they where returning object mass ↵UbitUmarov2012-04-094-69/+315
| | | | | | | | | | | | | | | | on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib).
| * | | llGetMass and llGetObjectMass (and push estimation) always use object mass ↵UbitUmarov2012-04-093-9/+30
| | | | | | | | | | | | | | | | as in current SL ( push is what makes sense or impulse will depend on what prim it is and not object). Added llGetMassMKS() that just returns 100 x llGetMass() as it seems to be in SL.
| * | | sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set ↵UbitUmarov2012-04-091-263/+147
| | | | | | | | | | | | | | | | sop.PhysActor, so made it return void.
* | | | Merge branch 'master' into careminsterMelanie2012-04-138-109/+178
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | Mantis 55025 Implement script time.Talun2012-04-127-46/+135
| | | | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
| * | | make changes to FlotsamCache.ini.example as noted in mantis #5960nebadon2012-04-121-2/+2
| | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5960
* | | | Merge branch 'master' into careminsterMelanie2012-04-1113-25/+171
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * | | HGFriendsModule: Type casts to fix compile errorSnoopy Pfeffer2012-04-111-1/+1
| | | |
| * | | HGFriendsModule: Added optional user level based restriction to send ↵Snoopy Pfeffer2012-04-113-4/+28
| | | | | | | | | | | | | | | | friendship invitations to foreign users.
| * | | HGFriendsModule: add the scaffolding for supporting permissions pertaining ↵Diva Canto2012-04-112-2/+32
| | | | | | | | | | | | | | | | to HG friendships. Snoopy take it from here.
| * | | New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as ↵Snoopy Pfeffer2012-04-105-2/+84
| | |/ | |/| | | | | | | originally proposed in SL Jira (https://jira.secondlife.com/browse/SVC-244).
| * | Add uri to various log messages when region registration fails. Upgrade ↵Justin Clark-Casey (justincc)2012-04-101-8/+15
| | | | | | | | | | | | some debug log messages to error.
| * | minor: convert tabs to spaces in config example files from recent 7c534e5Justin Clark-Casey (justincc)2012-04-102-12/+12
| | |
| * | Correct max_listeners_per_region in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | max_listens_per_region Value for this setting in OpenSimDefaults.ini (1000) is same as setting in code (1000) so this should have no effect Thanks to Ovi Chris Rouly for pointing this out.
| * | Do not timeout group member cache entry, as long as there are frequent group ↵Snoopy Pfeffer2012-04-101-0/+3
| | | | | | | | | | | | membership requests. These are caused by movements within the parcel boundaries.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-091-10/+2
|\ \ \ | | |/ | |/| | | | careminster
| * | Fix a LSL merge artefactMelanie2012-04-081-10/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-097-21/+159
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IScriptModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | Mantis5502 implementation of some of the new constantsTalun2012-04-096-20/+155
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | Addresses mantis #5846Diva Canto2012-04-081-1/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-083-50/+72
|\ \ \ | |/ / | | / | |/ |/|
| * A few more minor improvements on Suitcase inventory service.Diva Canto2012-04-071-7/+6
| |
| * Added gatekeeper and uas addresses to grid info, so that viewers can take ↵Diva Canto2012-04-072-0/+16
| | | | | | | | advantage of that info.
| * Better Suitcase Inventory Service.Diva Canto2012-04-061-48/+55
| |
* | Merge branch 'master' into careminsterMelanie2012-04-0727-373/+960
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-0610-128/+268
| |\
| | * Rather than having a FromFolderID property on every single prim and only ↵Justin Clark-Casey (justincc)2012-04-074-10/+19
| | | | | | | | | | | | | | | | | | ever using the root prim one, store on SOG instead. This reduces pointless memory usage.
| | * Store FromItemID for attachments once on SOG instead of on every SOP and ↵Justin Clark-Casey (justincc)2012-04-078-34/+29
| | | | | | | | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use.
| | * refactor: Eliminate unnecessary SOP.m_physActorJustin Clark-Casey (justincc)2012-04-061-10/+1
| | |
| | * Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL ↵Justin Clark-Casey (justincc)2012-04-061-0/+1
| | | | | | | | | | | | | | | | | | functions. This is the same as PRIM_POSITION