ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-24 10:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,818 Commits 5 Branches 93 Tags
a79bafaaaf3df2a0e1663bf9317ee53eb06db204
Commit Graph

2594 Commits

Author SHA1 Message Date
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
Melanie
eab211f94d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-06-21 01:10:13 +01:00
Justin Clark-Casey (justincc)
625e5e913a Comment out recently added log message detailing number of scripts started when compile queue empties for now 2012-06-20 00:25:18 +01:00
Justin Clark-Casey (justincc)
881e92a726 Raise some IO associated Exception logging in XEngine to error level, in line with other similar cases. 
Remove more unnecessary Close() calls - these are being triggered by the Dispose() called when exiting the using statement for these sdk io objects.
 2012-06-20 00:19:50 +01:00
Justin Clark-Casey (justincc)
0fa303b1cf Log how many scripts are candidates for starting and how many are actually started. 
Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
 2012-06-20 00:10:19 +01:00
Justin Clark-Casey (justincc)
ef686ead37 Like the assembly and text files, only write the c#-lsl linemap in XEngine.SetXMLState() if the trust binaries flag is set. 
This doesn't affect other locations where the map is written, such as on script compilation.
 2012-06-19 02:11:46 +01:00
Justin Clark-Casey (justincc)
8e7032ece8 minor: Add a little more detail to IOException logging in XEngine.SetXMLState() 
Also removes superflous Close() commands for statements taking place within using() constructs
Also adds some comment out debug log messages for future use.
 2012-06-19 01:53:50 +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
Justin Clark-Casey (justincc)
a8a9d13dc0 Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL where these aren't evaluated propertly. 
Addresses http://opensimulator.org/mantis/view.php?id=3268
 2012-06-09 05:11:08 +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