ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-27 20:35:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,368 Commits 5 Branches 93 Tags
fc576df273e41b47ff66b4bb503b9f86ded96cdb
Commit Graph

1264 Commits

Author SHA1 Message Date
UbitUmarov
723015e4f0 fix (http://opensimulator.org/mantis/view.php?id=5965) llGetObjectMass was bad for sitted avatars not checking for the null physicsactor 2012-04-16 21:58:25 +01:00
UbitUmarov
f05a977afa Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that should be checked. PROBLEM: it will not detect nonphysical phantons :( 2012-04-16 16:35:35 +01:00
UbitUmarov
87fdb2ed7e llGetMass and llGetObjectMass (and push estimation) always use object mass 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. 2012-04-09 20:53:29 +01:00
Melanie
6b5b73bfae Fix a LSL merge artefact 2012-04-08 13:18:03 +02:00
Melanie
b39de2425c Merge branch 'master' into careminster 
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
 2012-04-07 04:52:14 +01:00
Justin Clark-Casey (justincc)
7d8bb33c5b Store FromItemID for attachments once on SOG instead of on every SOP and only ever using the root part entry. 
This eliminates some pointless memory use.
 2012-04-07 00:33:02 +01:00
Justin Clark-Casey (justincc)
33e91f1088 Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL functions. 
This is the same as PRIM_POSITION
 2012-04-06 23:43:03 +01:00
Justin Clark-Casey (justincc)
4a58d4c5a4 refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos() 2012-04-06 23:36:13 +01:00
Justin Clark-Casey (justincc)
3af1cd65f9 Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene 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
 2012-04-06 22:41:35 +01:00
Justin Clark-Casey (justincc)
47108bb351 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-04-06 21:15:31 +01:00
Justin Clark-Casey (justincc)
f2903db390 For llGetMass(), return the mass of the avatar is the object is attached. 
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
This is the mass as used by the physics engine (ODE or Bullet).
 2012-04-06 21:14:19 +01:00
Talun
c3a8c00ce0 Addition of missing constants for llGetObjectDetails including for Mantis 5502 
Signed-off-by: nebadon <michael@osgrid.org>
 2012-04-06 12:42:46 -07:00
Justin Clark-Casey (justincc)
627efc172b Make llGetMass() return total mass of object when called on root prim. 
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
Aims to resolve http://opensimulator.org/mantis/view.php?id=5954
 2012-04-06 20:32:39 +01:00
Melanie
63c44719f7 Merge branch 'master' into careminster 
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
 2012-04-03 23:52:53 +01:00
Justin Clark-Casey (justincc)
e480e25d8b Fix more SOP.PhysActor race conditions in LSL_Api 2012-04-03 06:01:05 +01:00
Melanie
a6c26b093c Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-31 02:31:57 +01:00
Melanie
f3132c45d9 Merge branch 'master' into careminster 
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
 2012-03-31 02:18:02 +01:00
Justin Clark-Casey (justincc)
f0406f9fe2 Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ContainsPart method and remove method duplication. 
HasChildPrim is also misleading since the 'root' prim can also be returned.
 2012-03-31 01:45:37 +01:00
Melanie
807bb85ac2 Allow llTeleportAgent to work in attachments 2012-03-29 14:45:56 +02:00
Melanie
b18b1b1d70 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-03-27 23:14:43 +01:00
Snoopy Pfeffer
19837ff4dd Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups. 2012-03-27 22:30:02 +02:00
Snoopy Pfeffer
7223b63563 User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. 2012-03-27 22:09:58 +02:00
Melanie
da9743d1d7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
 2012-03-26 14:22:49 +01:00
Melanie
7e0936e4b6 Add a hust UUID to the script invocations 2012-03-26 14:19:55 +01:00
Melanie
44f1f87656 Merge branch 'master' into careminster 2012-03-25 20:07:43 +01:00
Mic Bowman
a14437ad5a Add support for key, vector, rotation and list types for both 
arguments and return values to the modInvoke family of functions.

See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
 2012-03-24 22:43:42 -07:00
Melanie
9a67baae21 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-23 14:24:55 +00:00
nebadon
6b87a29c86 fix yield prolog so it compiles with mono 2.11 there has been a bugzilla 
report files with mono project in regards to this change, this simply
lets us move forward with using mono 2.11 for now :
https://bugzilla.xamarin.com/show_bug.cgi?id=4052
 2012-03-23 02:22:57 -07:00
Melanie
53b4551b58 Fix merge issue from core 2012-03-22 20:48:31 +00:00
Melanie
3381899481 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-03-22 20:38:49 +00:00
Justin Clark-Casey (justincc)
9949ac2f9f refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity since non-default animations are handled completely separately from this class 2012-03-22 00:10:41 +00:00
Justin Clark-Casey (justincc)
1a8769e6ef Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead. 
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
 2012-03-21 23:57:39 +00:00
Melanie
c7e302864a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-18 20:44:56 +00:00
Justin Clark-Casey (justincc)
4a57112f19 Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927 
This allows one to get description data for a given prim inventory item.
Thanks MarcelEdward and GuduleLapointe!
 2012-03-17 04:02:23 +00:00
Mic Bowman
402ff75d78 Adds a new script command 'modInvoke' to invoke registered functions 
from region modules. The LSL translator is extended to generate the
modInvoke format of commands for directly inlined function calls.

A region module can register a function Test() with the name "Test".
LSL code can call that function as "Test()". The compiler will translate
that invocation into modInvoke("Test", ...)
 2012-03-15 13:16:02 -07:00
Melanie
d1daea0108 Allow llTeleportAgent to teleport gods when not in god mode 2012-03-14 19:21:25 +01:00
Melanie
c0f70d17fc Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-03-14 11:33:51 +00:00
Melanie
8388182707 Implement llSetPrimitiveParams for physics shape and material. Add 
llSetPhysicsMaterial support.
 2012-03-13 22:20:12 +01:00
Melanie
139c0665cf Add AVATAR_MALE flag to return values of llGetAgentInfo 2012-03-12 11:44:07 +01:00
Diva Canto
824eb7ed20 Added osGetGridGatekeeperURI() 2012-03-10 19:51:28 -08:00
Justin Clark-Casey (justincc)
94e58ff6b9 Use SP.ParentPart instead of ParentID in places where it's more efficient (saving extra null checks, etc.) 
However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null.
Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
 2012-03-09 02:38:11 +00:00
Melanie
dc5f831ca8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-03-09 02:39:14 +00:00
Melanie
42a7a85062 FireAndForget scripted rez - port from Avination 2012-03-09 00:57:49 +00:00
Melanie
caa19862fa Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-07 00:51:59 +00:00
Justin Clark-Casey (justincc)
98251cdab3 Add sensor, dataserver requests, timer and listener counts to "xengine status" command. 
This is for diagnostic purposes.
 2012-03-06 23:21:17 +00:00
Melanie
aa613dab1f Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-06 00:29:43 +00:00
Melanie
a7b61add99 Allow NPC to be removed by the owner of the parcel they're over. 
Don't allow NPC creation unless the prim owner has rez rights.
 2012-03-05 22:22:28 +01:00
Melanie
f2653b9b8e Teleport users to the cornfield when they are teleported with 
llTeleportAgentHome(). Don't try to teleport NPCs.
 2012-03-05 21:52:24 +01:00
Melanie
c2a73a26b5 SL compatibility - return only points on segemtn, not ray in llCastRay 2012-03-05 02:37:51 +01:00
Melanie
182f5efbe9 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-04 16:23:46 +00:00