aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
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
| |
| * Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPositionJustin Clark-Casey (justincc)2012-04-141-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-04-141-0/+65
|\ \ | |/ | | | | | | | | | | | | 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
| * Add very basic TestGetRootPartPosition() testJustin Clark-Casey (justincc)2012-04-141-0/+65
| |
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-132-273/+196
|\ \ | | | | | | | | | 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.
| * | 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-135-69/+125
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | Mantis 55025 Implement script time.Talun2012-04-125-8/+84
| | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
* | | Merge branch 'master' into careminsterMelanie2012-04-111-0/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * | New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as ↵Snoopy Pfeffer2012-04-101-0/+3
| | | | | | | | | | | | originally proposed in SL Jira (https://jira.secondlife.com/browse/SVC-244).
* | | Merge branch 'master' into careminsterMelanie2012-04-096-3/+135
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/Framework/Interfaces/IScriptModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Mantis5502 implementation of some of the new constantsTalun2012-04-095-2/+131
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Addresses mantis #5846Diva Canto2012-04-081-1/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-04-076-59/+218
|\ \ | |/ | | | | | | | | | | | | | | 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-064-97/+128
| |\
| | * Rather than having a FromFolderID property on every single prim and only ↵Justin Clark-Casey (justincc)2012-04-072-6/+15
| | | | | | | | | | | | | | | | | | 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-073-19/+13
| | | | | | | | | | | | | | | | | | 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
| | |
| | * Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene ↵Justin Clark-Casey (justincc)2012-04-061-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | or attachments. Return relative position to root prim rather than 0,0,0. Should fix same issue with llGetLocalPos() http://opensimulator.org/mantis/view.php?id=5951
| | * For llGetMass(), return the mass of the avatar is the object is attached.Justin Clark-Casey (justincc)2012-04-061-0/+16
| | | | | | | | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass This is the mass as used by the physics engine (ODE or Bullet).
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-061-20/+63
| | |\
| | * | remove possible PhysActor unexpectedly null race conditions when changing ↵Justin Clark-Casey (justincc)2012-04-032-63/+74
| | | | | | | | | | | | | | | | | | | | | | | | prim collision status factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics()
| * | | Moved the inventory manipulation from HGEntityTransferModule to ↵Diva Canto2012-04-061-0/+49
| | |/ | |/| | | | | | | HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway.
| * | If an AddItem fails, try adding it to the right folder type.Diva Canto2012-04-061-20/+63
| |/
* | minor changes.. a few physicsactor -> pa and a use a constant with |'ed ↵UbitUmarov2012-04-041-35/+31
| | | | | | | | bit fields in place of 6 individual checks ||'ed
* | remove more merge artefactsUbitUmarov2012-04-041-10/+3
| |
* | reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This ↵UbitUmarov2012-04-042-3/+3
| | | | | | | | functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque).
* | Fix the last merge artefactsMelanie2012-04-032-5/+5
| |
* | More artefactMelanie2012-04-031-1/+1
| |
* | Fix more merge artefactsMelanie2012-04-031-3/+3
| |
* | Remove duplicate implementation of Material { get; set; }Melanie2012-04-031-14/+0
| |
* | Fix merge artefactsMelanie2012-04-032-27/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-04-034-107/+201
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Eliminate race condition where many callers would check SOP.PhysicsActor != ↵Justin Clark-Casey (justincc)2012-04-034-150/+204
| | | | | | | | | | | | | | | | null then assume it was still not null in later code. Another thread could come and turn off physics for a part (null PhysicsActor) at any point. Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs No obvious reason for doing that copy - nothing else does it.
* | Merge branch 'master' into careminsterMelanie2012-03-317-65/+138
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return ↵Justin Clark-Casey (justincc)2012-03-315-29/+29
| | | | | | | | the 'root' part.
| * Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ↵Justin Clark-Casey (justincc)2012-03-312-32/+21
| | | | | | | | | | | | ContainsPart method and remove method duplication. HasChildPrim is also misleading since the 'root' prim can also be returned.
| * minor: small message adjustment and unnecessary code elimination when ↵Justin Clark-Casey (justincc)2012-03-311-1/+1
| | | | | | | | notifying client of no build permission
| * fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-311-1/+7
| |
| * refactor: Move "friends show cache" console command out into separate ↵Justin Clark-Casey (justincc)2012-03-301-4/+21
| | | | | | | | | | | | FriendsCommandsModule. Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵Justin Clark-Casey (justincc)2012-03-301-2/+22
| | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-291-1/+28
| |\
| | * Also add OSS header to interfaceMelanie2012-03-291-1/+28
| | |
| * | Add back parts of reverted changes that were not concerned with child agent ↵Justin Clark-Casey (justincc)2012-03-292-1/+6
| |/ | | | | | | | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents.
| * Change namespace on CallingCardModule and correct interface file placemant. ↵Melanie2012-03-291-0/+13
| | | | | | | | Also ass OpenSource header
generated by cgit v1.1 at 2024-12-27 00:19:34 +0000