ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,446 Commits 5 Branches 89 Tags
master
Commit Graph

3377 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
3717812ce0 refactor: In llCollisionSound() use existing GetInventoryItem() method rather than have it iterate through TaskInventory itself. 2012-07-04 21:15:00 +01:00
Justin Clark-Casey (justincc)
ae64d089c6 refactor: In llRemoveInventory() use existing GetInventoryItem() method rather than have it iterate through TaskInventory itself. 2012-07-04 21:05:51 +01:00
Justin Clark-Casey (justincc)
58b13d51a7 refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself. 2012-07-04 20:57:48 +01:00
Melanie
4f04ec5fc2 Implement the buggy version of llXorBase64Strings() for compatibility's sake 2012-07-02 02:04:56 +02:00
Melanie
7eb95c9ed9 Bring casing of llSHA1String in line with SL 2012-07-01 18:05:35 +02:00
Melanie
6137f37028 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-06-29 22:24:53 +01:00
Melanie
05cf51cbbd Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
 2012-06-29 22:11:49 +01:00
UbitUmarov
7ab8bc0a60 don't recoil attachments doing llRezObject() 2012-06-29 01:17:53 +01:00
UbitUmarov
58b4417140 Merge branch 'avination' into ubitwork 2012-06-29 01:00:38 +01:00
Justin Clark-Casey (justincc)
bfa6896678 Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG directly instead of an item ID to then shuffle through attachments, saving CPU busywork. 
Almost all callers already had the sog to hand.
Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
 2012-06-28 23:31:23 +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
8a03c153d5 Return NPC instead of AGENT in the detect parameters for touch, collision and 
sensor.
 2012-06-28 20:29:37 +02:00
UbitUmarov
29abb7d62a reactivate physics raycasts on llCastRay() until it's clear what is its problem if any... 2012-06-28 12:20:55 +01:00
UbitUmarov
de10a16546 Merge branch 'avination' into ubitwork 2012-06-28 10:57:47 +01:00
Melanie
41a1903c60 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-06-28 03:21:08 +01:00
BlueWall
988112d446 Add stub for llCastRay 2012-06-26 15:15:25 -04:00
Melanie
7cc5b3d7d3 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-06-26 17:35:55 +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
2ea8d820b0 Correct a wrong error constant 2012-06-26 10:48:27 +02:00
BlueWall
6d3ee8bb39 Fix script "Running" behavior 
Unchecking "Running" box in script editor now persists. This fixes http://opensimulator.org/mantis/view.php?id=6057
 2012-06-23 04:15:14 -04:00
Justin Clark-Casey (justincc)
d24122b706 Add item id, name, prim name and id to log message when state exists but loading fails. 
Drop logging about memory limit exceeded to warn from error
 2012-06-21 02:24:44 +01:00
Justin Clark-Casey (justincc)
afcabf5244 Retrigger build - last jenkins run was glitched 2012-06-21 02:13:03 +01:00
Justin Clark-Casey (justincc)
5709bed548 Add state file location to errors logged when there's some issue with retrieving state (e.g. exceeds memory limit) 2012-06-21 02:09:14 +01:00
UbitUmarov
ca22feb09a don't send a lot of avatar data when we are just changing position or rotation ( SendTerseUpdateToAllClients() in place of SendAvatarDataToAllAgents() ) 2012-06-17 13:28:33 +01:00
UbitUmarov
e7aceae3e0 split ugly expression in a if making it simpler to read 2012-06-17 09:06:25 +01:00
UbitUmarov
e2b9a5d7aa Don't let scripts rotate root part of physical linksets like SL, Update client rotation of avatars 'linked' to child parts. (put back some 'cosmetics' from previus commit). Still let lsl api use physics engine ideia of part Physical state on this where it should be SOP ideia, so is that is clear that sync with engine is SOP responsability. 2012-06-17 08:54:39 +01: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
Justin Clark-Casey (justincc)
daad0a3e11 Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL where these aren't evaluated propertly." 
This reverts commit a8a9d13dc0.

Accidentally committed, this patch might not be the correct approach.
 2012-06-11 23:30:58 +01:00
Justin Clark-Casey (justincc)
cbb5ddd944 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-06-11 23:27:48 +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