ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-31 06:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,131 Commits 5 Branches 93 Tags
05cf51cbbdb3f33bb4c532eefc24eb0a194ed378
Commit Graph

1304 Commits

Author SHA1 Message Date
Melanie
05cf51cbbd Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
 2012-06-29 22:11:49 +01:00
Melanie
a1a22a2f10 Revert "Mantis 5977 Corrections to llRegionSayTo" 
This reverts commit 679da63da6.

Conflicts:

	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2012-06-28 22:02:20 +01:00
Melanie
2548d15878 Disable physics raycast until it can be seen to. Fix distance calculation 
for some results.
 2012-06-26 10:48:52 +02:00
Melanie
ff21007b93 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-06-15 15:48:34 +01:00
Melanie
ffc0badaf4 Reapply the one change that was in the revert that was actually function, not 
form
 2012-06-15 15:18:57 +02:00
UbitUmarov
5d32979170 Revert changes... 
This reverts commit c8227e1bb7.
 2012-06-15 14:31:35 +01:00
UbitUmarov
db2dcbbe2d SL doesn't let scripts rotate root part of physical linksets also fix sitting avatars rotations broken in previus commit, forcing send of updates. 2012-06-15 14:10:16 +01:00
UbitUmarov
c8227e1bb7 only rotation of root part change parts positions, so only call ResetChildPrimPhysicsPositions() if root part. Plus 'cosmetics' 2012-06-15 11:24:37 +01:00
Melanie
d893e54f4b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-06-14 00:10:52 +01:00
UbitUmarov
aac80550e0 Merge branch 'avination' into ubitwork 2012-06-13 05:16:18 +01:00
UbitUmarov
7bd274b3d3 Changed t adding the avatar dependent sit offset and not subtracting, so not to break inworld contents. SL ported scripts will show a sit error around 0.1m. Added respective compensation in LSL api to maintain coerence. Fixed several bugs still on SET/GET[link]PrimitiveParams[fast] and llGetObjectDetails() 2012-06-13 04:59:09 +01:00
Justin Clark-Casey (justincc)
1f34c8277d In the osGetGrid functions, if the [GridInfo] section does not exist then return "Configuration Error", as already happens if there is no GridInfoURI 2012-06-13 04:05:02 +01:00
UbitUmarov
b30c23eba4 convert a LSL rotation of <0,0,0,0> to <0,0,0,1> and not <0,0,1,0> in SitTarget. Something seems to be doing that before this gets called, but just in case... 2012-06-13 02:50:39 +01:00
Melanie
4e18e71089 Committing the Avination implementation of llCastRay. This is a complete rewrite 
wich does it's thing independently of physics. Enjoy!
 2012-06-13 02:32:25 +01:00
UbitUmarov
4027c8e9c9 Fixed llGetObjectDetails(), OBJECT_ROT for sitting avatars case, plus 'cosmetics' and added some parts costs information. 2012-06-13 01:51:22 +01:00
UbitUmarov
b4ab9a7350 *TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. Changed the sign of the sitoffset dependent on avatar size in SP.cs. Removed that offset correction from SET/GET..primitiveParams in LSL api. If the sign needs to be the previus one, then all references to avatar positions on LSL api need to be fixed with that correction, not only SET/GETprimitiveParams. 2012-06-13 01:26:15 +01:00
Melanie
ff450d29da Add detecting non-physical phantoms back into raycast 2012-06-13 01:59:54 +02:00
UbitUmarov
f51ef99bd5 try to replicate SL bug of PRIM_ROTATION also for avas, est a fix to other cases 2012-06-12 08:05:40 +01:00
UbitUmarov
5784b3eb31 fix the try.. finally in SetPrimitiveParams i did mess and add one for the avatars case, so to optimize a bit 'warp' scripts. 2012-06-12 05:57:28 +01:00
UbitUmarov
8b5342f613 more changes to Get and Get primitiveparams: Let Get remove avatarheight adjust,add Get PRIM_LINK_TARGET handling, changed avatar Set positions code... 2012-06-12 05:21:49 +01:00
UbitUmarov
5fd6f678a4 Moved auxiliar funtions of last commit from sop to lsl api since they are only used on one place each 2012-06-12 02:20:47 +01:00
UbitUmarov
24e8e5d818 *UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar code in SOP.cs 2012-06-12 01:26:03 +01:00
UbitUmarov
d151b334fa Merge branch 'avination' into ubitwork 2012-06-11 19:39:00 +01:00
Melanie
84377a23db Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
 2012-06-11 16:56:40 +01:00
Melanie
71ba85137f Commitig the Avination implementation of llTeleportAgent and 
llTeleportAgentGlobalCoords. These do NOT use PERMISSION_TELEPORT like
their SL counterparts because that permission is not yet understood by TPVs
based on v1.x.
 2012-06-11 16:45:52 +01:00
Melanie
853449d5bc Make llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGlobalCoords() 2012-06-08 23:37:25 +02:00
UbitUmarov
22437af26a *UNTESTED* fix PRIM_LINK_TARGET. Make it work on avatars, set any pending position change on others; don't assume m_host is in same grp that part (possible always is)... 2012-06-08 15:48:46 +01:00
UbitUmarov
f0a6ec151a *UNTESTED* let SetPrimParams for avatars parse even unsupported parameters so that if a supported one is in the middle of then it still works. 2012-06-08 15:27:21 +01:00
UbitUmarov
9d878591c8 *UNTESTED* added PRIM_POS_LOCAL and PRIM_ROT_LOCAL in SetPrimParams for avatars. Stopped setting position twice in normal SetPrimParams 2012-06-08 14:29:02 +01:00
Melanie
69dd5b855a Merge branch 'avination' into careminster 2012-06-07 23:34:22 +01:00
Melanie
31bc9c3ad3 Typo correction 2012-06-07 18:04:09 +02:00
Melanie
91557f18cd Set collision sound type so custom sound types are recognized 2012-06-07 17:59:20 +02:00
Melanie
5876a4d392 Prevent a null ref when getting the velocity of an avatar during login or 
logout.
 2012-06-07 00:24:07 +02:00
Melanie
b02db11c69 Remove a null ref when an avatar's attachment gets the avatar velocity 
while the avatar is logging in or out.
Also remove some unlocking calls without matching locking call. Merge
artefact cleanup, again.
 2012-06-06 20:38:42 +02:00
Melanie
c0b21d92c2 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-06-06 14:16:19 +01:00
Melanie
e733fb32cf Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
 2012-06-06 13:07:05 +01:00
UbitUmarov
372b76031b revert last bad commit but fix recoil direction 2012-06-05 05:52:25 +01:00
UbitUmarov
768447e41b Stop llRezAtRoot() from applying velocity setting impulse in World.RezObject, doing it only in itself, so its applyed after resuming scripts etc. It was giving twice the requested velocity. 2012-06-05 04:43:23 +01:00
Justin Clark-Casey (justincc)
01280e9b94 Remove unused ScenePresence list structure in llGetAgentList() 2012-06-05 00:34:18 +01:00
Melanie
28e5abd917 Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach positions. 2012-06-04 21:05:56 +02:00
Melanie
8e735efff0 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-06-02 02:01:48 +01:00
Melanie
928e3e9e21 Fix LSL animation state reporting and animation state transitions on crossing 2012-06-01 23:04:28 +02:00
Melanie
e696d1d952 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-05-31 03:37:43 +01:00
Melanie
86f786d673 Prevent multiple requests to go physical from reaching the physics plugin 2012-05-30 16:10:01 +02:00
Melanie
884c0e7bb1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-05-27 19:24:30 +01:00
Justin Clark-Casey (justincc)
7fd38788b4 minor: code formatting from 0b72f773 2012-05-26 02:14:32 +01:00
Talun
0b72f773c7 Mantis 6025 llRequestPermissions auto grant for NPCs. 
If the script requesting permissions is owned by either the NPC or
the NPCs owner (if the NPC is created as owned) then grant any
permissions automatically.
 2012-05-26 02:09:22 +01:00
Blake.Bourque
33b66009e4 One can now get hyoergrid region co-ordinates with llRequestSimulatorData 2012-05-26 01:32:42 +01:00
Justin Clark-Casey (justincc)
d6476b6277 Use GetInventoryItem() in LSL_Api.InventoryKey(string name, int type). 
Also removes small bug where calling this method would add 1 to LPS, evne though all callers already did this.
 2012-05-26 01:03:53 +01:00
Justin Clark-Casey (justincc)
f2a5fad18f Use SceneObjectPartInventory.GetInventoryItem() in OSSL.AvatarStopAnimation instead of searching the task inventory manually. 2012-05-26 00:54:00 +01:00