ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-02 08:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,347 Commits 5 Branches 94 Tags
aecb32b74efa5b74adcfc026f7261f43ad5934f4
Commit Graph

1591 Commits

Author SHA1 Message Date
Melanie
aecb32b74e Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-01-10 01:25:07 +00:00
UbitUmarov
b70d50edf2 fix llGetRot and parameters prim_rotation for attachments. Only on 
LSL_api to avoid side effects for now
 2013-01-09 17:59:32 +00:00
UbitUmarov
b528281018 stop endless loop in lGetLinkPrimitiveParams 2013-01-09 17:01:09 +00:00
Melanie
27b0914681 Prevent a null ref in llGetLinkPrimiteveParams. Still not a fix for the real 
issue.
 2013-01-09 16:01:00 +01:00
Melanie
e62b14024f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-01-04 22:39:07 +00:00
Justin Clark-Casey (justincc)
7232cedd2b Set default particle burst count to 1 instead of 0 in any set particle system script call that does not have an empty list. 
As per http://opensimulator.org/mantis/view.php?id=6353
 2013-01-04 21:37:11 +00:00
Justin Clark-Casey (justincc)
7e45096314 Fix build break caused by missing ) from dce2809. 
Was hand-typing in a line of code I had tested before but not retested this time
 2013-01-04 21:22:51 +00:00
Justin Clark-Casey (justincc)
dce2809137 Automatically grant sit-related llRequestPermissions() for subsequent avatars sitting on the same scene obejct, instead of wrongly popping up request permissions dialog. 
Resolves http://opensimulator.org/mantis/view.php?id=6478
 2013-01-04 21:18:53 +00:00
Justin Clark-Casey (justincc)
a3bf3a2aa5 refactor: simplify llGetNumberOfPrims() to return prim count + sitting avatar count rather than independently inspecting every scene presence 2013-01-04 20:56:39 +00:00
Justin Clark-Casey (justincc)
9869ca83b4 Fix llGetLinkName() to return the name of the last avatar sat as the last link number. 
As per http://wiki.secondlife.com/wiki/LlGetLinkName
 2013-01-04 20:54:11 +00:00
Justin Clark-Casey (justincc)
9503383887 Fix llGetLinkKey() to return the last sat avatar as the last link number. 
As per http://wiki.secondlife.com/wiki/LlGetLinkKey
This is done by keeping a scene-object wide list of sitters.
This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim.
This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists
Addresses http://opensimulator.org/mantis/view.php?id=6477
 2013-01-04 20:34:39 +00:00
SignpostMarv
a5ac6af16a Improving documentation of AttachToAvatar and GetLine methods in LSL_Api.cs based on doxygen error output 2013-01-03 00:17:24 +00:00
Oren Hurvitz
1a6694b264 Fixed several problems with the Sun: some settings didn't work, or were inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky) 2013-01-02 23:16:24 +00:00
Justin Clark-Casey (justincc)
30e5e5cce6 If an NPC is unowned, then always auto-grant permissions requested via llRequestPermissions() 
This is consistent with all other OSSL NPC functions that allow unowned avatars to be manipulated.
Aims to address http://opensimulator.org/mantis/view.php?id=6483
 2013-01-02 19:25:52 +00:00
Melanie
7943c8d11c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-01-02 11:52:37 +00:00
teravus
92c26e4994 * ubit pointed out another place where that check needed to be updated and I normalized it. 2013-01-01 23:55:24 -05:00
teravus
f9148e5fc7 * This is actually the fix described the last commit.. I had commented it out to see if the problem had affected all attachments or just HUD attachments. 2013-01-01 23:11:46 -05:00
teravus
397aa74777 * Fixes the attachment scripted rotation bug. The problem is the code was relying on m_host.ParentId = 0 to determine if the attachment should be rotated against root prim offset. To fix it for attachments, we also need to check if the host's localID == RootPart's localID. otherwise we are cumulatively rotating against the host's root part rotation offset (which in this case, is it's own rotation) 2013-01-01 23:07:37 -05:00
Robert Adams
4914d6c0ea Resolve Mantis 6480 (http://opensimulator.org/mantis/view.php?id=6480) 
by reversing the sign on the recoil computation and adding a
[XEngine]RecoilScaleFactor parameter which defaults to zero.
Testing in SL seems to show that there is not a recoil action there.
Or, at least, it is very small. If someone knows how small, the default
for the scale factor should be changed.
 2012-12-31 19:57:20 -08:00
Melanie
569f39e124 Merge branch 'master' into careminster 2012-12-21 22:13:41 +00:00
Robert Adams
d15bfcf614 Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags. 2012-12-18 19:25:40 -08:00
Melanie
79bdf464d3 Merge branch 'avination' into careminster 2012-12-18 09:48:12 +00:00
UbitUmarov
1eddc4a9da fix regression 2012-12-07 14:01:22 +00:00
UbitUmarov
135e0ea853 *TEST* add some avatar skeleton information and use it to calculate avatar 
height and bounding box. Change LSL acording.
 2012-12-07 13:47:58 +00:00
Melanie
5837e731bf Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
 2012-12-04 23:01:18 +00:00
BlueWall
ac65085cc3 XmlRpcGridRouter 
Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called.

  See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or
       https://github.com/BlueWall/XmlRpcRouter

  for php gateway and test code.
 2012-12-03 20:16:44 -05:00
Melanie
b7c3a4fa7f Merge branch 'avination' into ubitwork 2012-12-03 19:46:16 +01:00
Melanie
d3904ff484 Add a transaction ID to the money module path for llTransferLindenDollars 2012-12-03 19:34:22 +01:00
UbitUmarov
f254af29ac avoid potencial NullReferenceException 2012-11-24 03:39:37 +00:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
aeeaa3a0a9 Added AssemblyInfos to every dll in the OpenSim.Region namespace. 2012-11-14 11:09:43 -08:00
Melanie
415b89f434 Merge branch 'master' into careminster 2012-11-09 22:58:42 +00:00
PixelTomsen
64c80aec64 llSetLinkCamera implementation 
wiki: http://wiki.secondlife.com/wiki/LlSetLinkCamera

mantis: http://opensimulator.org/mantis/view.php?id=6397
 2012-11-09 14:31:56 -08:00
Melanie
236cc1f268 Change user message on TeskInventoryAccepted to let the viewer format it 
properly
 2012-11-05 00:05:01 +00:00
Melanie
48569e856a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-30 01:02:20 +00:00
SignpostMarv
dcac2a7f71 refactoring llCollisionSound to use new KeyOrName method 2012-10-29 23:39:01 +00:00
SignpostMarv
a9999a9676 Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint 2012-10-29 23:39:01 +00:00
SignpostMarv
ef15711089 refactoring llTriggerSoundLimited to not use the LSL methods, since that will cause unnecessary calls to m_host.AddScriptLPS(1) 2012-10-29 23:39:00 +00:00
SignpostMarv
af9dc483e9 refactoring llGetPos() to take advantage of implicit converter 2012-10-29 23:39:00 +00:00
SignpostMarv
f9923d4423 shifting from two instances of typecasting to one instance of typecasting in llTriggerSoundLimited 2012-10-29 23:39:00 +00:00
SignpostMarv
c796f7861e 80-character width terminal formatting of recent commits to llPlaySound, llPlaySoundSlave, llTriggerSound and llTriggerSoundLimited 2012-10-29 23:39:00 +00:00
SignpostMarv
c5af16aef8 shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string 2012-10-29 23:39:00 +00:00
SignpostMarv
5abcecc735 moving SendSound from SceneObjectPart to ISoundModule 2012-10-29 23:39:00 +00:00
SignpostMarv
9df510157e deduplicating code into a single LoopSound method 2012-10-29 23:38:59 +00:00
SignpostMarv
d7ffcace8f adjusting parameter order of PreloadSound to be more logical 2012-10-29 23:38:59 +00:00
SignpostMarv
29a8ae48b5 transposing LoopSoundMaster to Sound Module 2012-10-29 23:38:59 +00:00
SignpostMarv
a68e2fe169 transposing preload sound onto sound module 2012-10-29 23:38:58 +00:00
SignpostMarv
8763a637b5 transposing stop sound into sound module 2012-10-29 23:38:58 +00:00
SignpostMarv
206a694c6b moving comment for llStopSound inside the method block prior to transposition to sound module 2012-10-29 23:38:58 +00:00
SignpostMarv
7560010f34 Immediately setting gain to zero as a workaround for code not stopping sound started by llPlaySound 2012-10-29 23:38:56 +00:00