aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-2117-130/+241
|\ | | | | | | | | | | | | | | 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
| * Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() ↵Justin Clark-Casey (justincc)2012-06-201-2/+3
| | | | | | | | instead of magic numbers
| * refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() ↵Justin Clark-Casey (justincc)2012-06-201-2/+3
| | | | | | | | instead of attachmentpoint magic numbers.
| * As with LLSDInventoryItem from commit 01a2b0b, send type values in ↵Justin Clark-Casey (justincc)2012-06-202-8/+4
| | | | | | | | | | | | LLSDInventoryFolder for inventory CAPs as integers rather than strings. Should also resolve some issues with exceptions being thrown in some inventory fetches.
| * Lower warn logging on not having friends/group module on permissions to debug.Justin Clark-Casey (justincc)2012-06-201-2/+2
| | | | | | | | It's a valid configuration not to have these modules, but I think it's still worth logging the fact that certain permissions won't work (always return true)
| * minor: Lower flotsam asset cache warning about not having a FlotsamCache.ini ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | | | | | to debug It's perfectly okay not to have this section.
| * Remove STARTUP COMPLETE message from the startuplogo.txt file and into main ↵Justin Clark-Casey (justincc)2012-06-201-1/+3
| | | | | | | | logging
| * Comment out the neighbour and land in connectors from info logging that they ↵Justin Clark-Casey (justincc)2012-06-203-3/+3
| | | | | | | | are starting up
| * Comment out recently added log message detailing number of scripts started ↵Justin Clark-Casey (justincc)2012-06-201-2/+2
| | | | | | | | when compile queue empties for now
| * Raise some IO associated Exception logging in XEngine to error level, in ↵Justin Clark-Casey (justincc)2012-06-201-7/+5
| | | | | | | | | | | | 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.
| * Log how many scripts are candidates for starting and how many are actually ↵Justin Clark-Casey (justincc)2012-06-205-66/+166
| | | | | | | | | | | | started. Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
| * If RegionReady is active, don't falsely say that logins are enabled in the ↵Justin Clark-Casey (justincc)2012-06-201-2/+2
| | | | | | | | | | | | main scene loop before RegionReady is signalled when initial script compilation finishes. Also raises this logging level to Info from Debug since this information is of high importance. This matches the behaviour of the RegionReady module
| * minor: If logging because mesh/sculpt data isn't present for an object, log ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | object UUID rather than local id, since UUID doesn't potentially vary between simulator starts.
| * Like the assembly and text files, only write the c#-lsl linemap in ↵Justin Clark-Casey (justincc)2012-06-191-27/+27
| | | | | | | | | | | | 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.
| * minor: Add a little more detail to IOException logging in XEngine.SetXMLState()Justin Clark-Casey (justincc)2012-06-191-11/+14
| | | | | | | | | | Also removes superflous Close() commands for statements taking place within using() constructs Also adds some comment out debug log messages for future use.
| * Change read config paramter from max_urls_per_simulator to ↵Justin Clark-Casey (justincc)2012-06-161-1/+1
| | | | | | | | max_external_urls_per_simulator, which is what it was meant to be
| * Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses ↵Justin Clark-Casey (justincc)2012-06-161-3/+1
| | | | | | | | would always return OK even if some other status code had been set
| * Implement max_external_urls_per_simulator setting in [LL-Functions] to allow ↵Justin Clark-Casey (justincc)2012-06-161-1/+8
| | | | | | | | | | | | | | configuration of how many urls can be set up by llRequestURL() Defaults remains as 100. This setting is per simulator instead of per region due to how the url script module is structured.
* | Merge branch 'master' into careminsterMelanie2012-06-155-10/+10
|\ \ | |/
| * Add region name to UseCircuitCode log messagesJustin Clark-Casey (justincc)2012-06-151-4/+4
| |
| * Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-154-6/+6
| | | | | | | | scattering them over other categories
* | Merge branch 'avination' into careminsterMelanie2012-06-153-94/+588
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Reapply the one change that was in the revert that was actually function, notMelanie2012-06-151-1/+1
| | | | | | | | | | | | form
| * | Revert changes...UbitUmarov2012-06-152-76/+37
| | | | | | | | | | | | This reverts commit c8227e1bb70817351de283fb647ec39f090fc9f1.
| * | SL doesn't let scripts rotate root part of physical linksets also fix ↵UbitUmarov2012-06-151-16/+27
| | | | | | | | | | | | sitting avatars rotations broken in previus commit, forcing send of updates.
| * | Add sop IsPhysical and IsPhantom to be used gradually in core in place of ↵UbitUmarov2012-06-151-3/+21
| | | | | | | | | | | | asking physics engines all the time. Some engines delays may make them give wrong answers.
| * | only rotation of root part change parts positions, so only call ↵UbitUmarov2012-06-151-21/+31
| | | | | | | | | | | | ResetChildPrimPhysicsPositions() if root part. Plus 'cosmetics'
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-06-131-3/+11
| |\ \
| | * | Add detecting non-physical phantoms back into raycastMelanie2012-06-131-3/+11
| | | |
| * | | Changed t adding the avatar dependent sit offset and not subtracting, so ↵UbitUmarov2012-06-132-27/+46
| | | | | | | | | | | | | | | | 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()
| * | | convert a LSL rotation of <0,0,0,0> to <0,0,0,1> and not <0,0,1,0> in ↵UbitUmarov2012-06-131-1/+1
| | | | | | | | | | | | | | | | SitTarget. Something seems to be doing that before this gets called, but just in case...
| * | | Fixed llGetObjectDetails(), OBJECT_ROT for sitting avatars case, plus ↵UbitUmarov2012-06-131-9/+23
| | | | | | | | | | | | | | | | 'cosmetics' and added some parts costs information.
| * | | *TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. ↵UbitUmarov2012-06-132-10/+19
| | | | | | | | | | | | | | | | 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.
| * | | try to replicate SL bug of PRIM_ROTATION also for avas, est a fix to other ↵UbitUmarov2012-06-121-3/+10
| | | | | | | | | | | | | | | | cases
| * | | fix the try.. finally in SetPrimitiveParams i did mess and add one for the ↵UbitUmarov2012-06-121-188/+156
| | | | | | | | | | | | | | | | avatars case, so to optimize a bit 'warp' scripts.
| * | | more changes to Get and Get primitiveparams: Let Get remove avatarheight ↵UbitUmarov2012-06-121-26/+94
| | | | | | | | | | | | | | | | adjust,add Get PRIM_LINK_TARGET handling, changed avatar Set positions code...
| * | | Moved auxiliar funtions of last commit from sop to lsl api since they are ↵UbitUmarov2012-06-122-39/+22
| | | | | | | | | | | | | | | | only used on one place each
| * | | *UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar ↵UbitUmarov2012-06-122-3/+272
| | | | | | | | | | | | | | | | code in SOP.cs
| * | | change object drag so it applies a impulse and not a push force so it works ↵UbitUmarov2012-06-111-2/+6
| | | | | | | | | | | | | | | | as before my fix to impulse/forces
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-06-114-7/+80
| |\ \ \ | | |/ /
| * | | *UNTESTED* fix PRIM_LINK_TARGET. Make it work on avatars, set any pending ↵UbitUmarov2012-06-081-7/+37
| | | | | | | | | | | | | | | | position change on others; don't assume m_host is in same grp that part (possible always is)...
| * | | *UNTESTED* let SetPrimParams for avatars parse even unsupported parameters ↵UbitUmarov2012-06-081-2/+84
| | | | | | | | | | | | | | | | so that if a supported one is in the middle of then it still works.
| * | | *UNTESTED* added PRIM_POS_LOCAL and PRIM_ROT_LOCAL in SetPrimParams for ↵UbitUmarov2012-06-081-6/+46
| | | | | | | | | | | | | | | | avatars. Stopped setting position twice in normal SetPrimParams
* | | | Merge branch 'master' into careminsterMelanie2012-06-158-148/+249
|\ \ \ \ | | |_|/ | |/| |
| * | | Make the "debug http" command available for robust as well as the simulator. ↵Justin Clark-Casey (justincc)2012-06-155-110/+91
| | | | | | | | | | | | | | | | | | | | | | | | This allows one to see incoming requests as they happen. This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
| * | | Add main instance to internal MainServer.m_Servers list to simplify internal ↵Justin Clark-Casey (justincc)2012-06-155-22/+75
| | | | | | | | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance
| * | | minor: Tell user the current debug http level if "debug http" console ↵Justin Clark-Casey (justincc)2012-06-151-3/+11
| | | | | | | | | | | | | | | | command is executed without a level parameter
| * | | When setting debug http level, do this for all known http servers, not just ↵Justin Clark-Casey (justincc)2012-06-153-22/+41
| | | | | | | | | | | | | | | | the main instance.
| * | | Make XMLRPCModule use an existing HTTP server if one already exists on the ↵Justin Clark-Casey (justincc)2012-06-151-4/+5
| | | | | | | | | | | | | | | | desired port.
| * | | Get rid of some unnecessary null checks in ↵Justin Clark-Casey (justincc)2012-06-152-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | RegionApplicationBase.StartupSpecific() - a constructor can never return null. Also adds some method doc to MainServer