OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,691 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

20691 Commits (4a969b45bd3032c8f744ef816347711f67809a37)

Author SHA1 Message Date
Mic Bowman a76a289d11 Adds support to ScriptModuleComms for region modules to export 
constants to the script engine.
 2012-07-31 10:45:37 -07:00
Robert Adams f9a8915cca BulletSim: update the DLLs and SOs. This fixes the exception on shutdown 2012-07-31 09:44:32 -07:00
Robert Adams 50dbb9ffe4 BulletSim: add parameters and API calls for setting ERP and CFM. 
Set ERP and CFM in linkset constraints.
Reorder rebuilding of object bodies so they are not rebuilt everytime
   something is linked and unlinked.
 2012-07-31 09:23:05 -07:00
Justin Clark-Casey (justincc) 6b1d12edcb Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-07-30 23:25:54 +01:00
Justin Clark-Casey (justincc) b899d64dc1 If we're fetching active gestures via the XInventoryServiceConnector, then properly look at the ITEMS dictionary already returned rather than the level above this. 2012-07-30 23:14:20 +01:00
Melanie bd262fe3ed Correct StandUp position and rotation 2012-07-30 03:05:57 +02:00
Melanie e012c81d7c Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-29 16:11:20 +01:00
Melanie 277491d871 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-29 16:10:45 +01:00
Melanie 3f6dfa92ab Return world rotation on llGetObjectDetails()'s OBJECT_ROT 2012-07-29 16:05:35 +01:00
Melanie 88d68e68c1 Return world rotation on llGetObjectDetails()'s OBJECT_ROT 2012-07-29 15:40:31 +02:00
Melanie 30784ab9e1 Fix an exception while outputting a log message 2012-07-29 15:12:03 +02:00
Melanie 659be9dd50 When controls are released by script, don't drop the permission to 
retake them.
 2012-07-29 15:11:39 +02:00
Melanie 729046e1ad See that if controls are taken, those are released before taking new ones 2012-07-29 15:10:12 +02:00
Melanie 9163cdd7c1 Bump number of URLs to 15000 per region 2012-07-29 15:09:42 +02:00
Melanie 45b72bf01c Fix some merge issues and a functional issue in the scene manager 2012-07-28 01:06:28 +01:00
Melanie e60ec599e5 Add master's new binaries 2012-07-28 00:41:31 +01:00
Melanie 771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00
SignpostMarv 72d29bdb40 LSL/OSSL lacks Math.Min & Math.Max implementations. 2012-07-28 00:09:11 +01:00
Justin Clark-Casey (justincc) 7e89b99e6a Avoid a race condition between the scene shutdown thread and the update thread since commit c150320 (Thu Jul 26 15:27:18 2012) 
c150320 started explicitly disposing of the physics scene and nulling it out on region shutdown.
However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation.
This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked.
This should not affect the few other places that use this flag.
 2012-07-27 23:58:53 +01:00
SignpostMarv adbdb220df making first run more resilient to bad input (loop until good input, rather than crash) 2012-07-27 23:40:19 +01:00
SignpostMarv b23ab3ea85 adding asset cache and map tile directories to .gitignore 2012-07-27 23:37:24 +01:00
Justin Clark-Casey (justincc) d4f476c7ce Remove the LandGeom checks in OdeScene - these are pointless since LandGeom is always IntPtr.Zero and contacts returned always have a valid geometry. 
Possibly this was for a feature that was never implemented or was otherwise removed.
Thanks to SignpostMarv for the spot of the warning that shows this parameter was never changed.
 2012-07-27 23:31:19 +01:00
justincc 134c6d181f Update OpenMetaverse libraries at commit 6212cbd, this time built on Windows 
This is to try and resolve a strange Initialization exception for the AppearanceManager type that only occurs on Windows 64 bit (not Windows 32 bit or Linux!)
 2012-07-27 23:05:17 +01:00
Justin Clark-Casey (justincc) f3c5ce1bbd minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is currently calculated dynamically 2012-07-27 22:20:43 +01:00
Justin Clark-Casey (justincc) 0d9afad3fe Remove duplicated IScenePresence.PresenceType. This is already in ISceneAgent.PresenceType from which IScenePresence inherits. 
No other code changes required.
 2012-07-27 22:15:25 +01:00
Justin Clark-Casey (justincc) cd44c3b90a Replace libopenmetaverse commit 6212cbd with the same libraries but this time built with xbuild rather than nant. 
This may fix Windows and some mono version builds.
 2012-07-27 21:50:18 +01:00
Justin Clark-Casey (justincc) 1133f81dce Remove a couple of compiler warnings pointed out by SignpostMarv 2012-07-27 20:40:25 +01:00
Justin Clark-Casey (justincc) 811dc95105 Update libopenmetaverse to commit 6212cbd (Wed Jul 25 20:11:47 2012) 
Built from https://github.com/openmetaversefoundation/libopenmetaverse/commits/master
This update incorporates a fix by Melanie in libomv where textures would sometimes rotate slightly when other properties were changed.
Hence addresses http://opensimulator.org/mantis/view.php?id=6100
This update also incorporates libomv bot code updates that significantly reduce the warning spam for pCampbot.
The change rate of libomv is low and many changes refer to bot or code not used by OpenSimulator, so I think it is sufficiently stable to use evne though it's not a release.
 2012-07-27 20:16:29 +01:00
Melanie 9f6236f5bf Implement the linefeed URL hack for ShoutCast and other services 2012-07-27 12:10:04 +02:00
BlueWall 6ee17f5b36 Add autoclean for scripted use 
./runprebuild.sh autoclean - cleans projects w/o prompting
 2012-07-26 21:39:53 -04:00
BlueWall f4bae34283 Add target switches 
./runprebuild.sh vs2008/vs2010 to set the target
 2012-07-26 21:34:33 -04:00
BlueWall faf250df2d add clean task to reuprebuild.sh 
./runprebuild.sh clean to clean up the project files
 2012-07-26 21:28:20 -04:00
Melanie be22e3599c Change the stair fudge factor so steps of 0.5m can be climbled to match inworldz claims and SL's realities 2012-07-27 03:24:45 +02:00
Justin Clark-Casey (justincc) 5f741143fd Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-07-27 00:30:04 +01:00
Justin Clark-Casey (justincc) 21b1fec32d Fix issue where RegionCombinerModule was not removing regions from its dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded). 2012-07-27 00:28:23 +01:00
Robert Adams ce812c88cc BulletSim: fix a recursive loop when fetching the mass of the root of a linkset. 2012-07-26 16:06:00 -07:00
Robert Adams 7d30637d51 BulletSim: refactor all the linkset logic out of the prim class 
and into its own class. The BulletSim data structures track
individual prims as linksets of 1 so most of the prim code is not
different between a linked and unlinked object.
 2012-07-26 16:05:57 -07:00
Robert Adams d4a667a918 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-07-26 16:04:11 -07:00
Robert Adams 9e914f5c32 Add check so Ode does not try to simulate after it has been Dispose()'ed. Fixes exception that happens when shutting down region (improvements from last patch) 2012-07-26 16:03:15 -07:00
Justin Clark-Casey (justincc) 0aaf52fca4 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-07-26 23:46:54 +01:00
Justin Clark-Casey (justincc) 66824dd18c When copying items, copy the item description field instead of the asset description field. 
If we copy the asset description then we will only ever replicate the very first description, if there was one, not any subsequent changes.
Thanks to Oren Hurvitz of Kitely for this patch from http://opensimulator.org/mantis/view.php?id=6107
I have adapted it slightly to change the order of arguments (name before description rather than vice-versa) and slightly improve some method doc.
 2012-07-26 23:44:29 +01:00
Robert Adams c1503205c0 Add a Dispose() of the physics engine when a scene is being shutdown. 2012-07-26 15:27:18 -07:00
Robert Adams c6d02801db BulletSim: update BulletSim DLLs and SOs 2012-07-25 16:31:22 -07:00
Robert Adams 9ca1075e7e BulletSim: remove unused, commented out code in BSConstraint 2012-07-25 16:31:17 -07:00
Robert Adams 0a4c080e63 BulletSim: fix line endings in newly added files (Is it DOS or is it UNIX? Only it's hairdresser knows for sure) 2012-07-25 16:31:12 -07:00
Robert Adams d7add2940a BulletSim: add parameters for setting linkset constraint factors 2012-07-25 16:31:08 -07:00
Robert Adams 75f7721b0c BulletSim: small change to use the pointer to the bullet object for zeroing forces. 2012-07-25 16:31:04 -07:00
Robert Adams bf6529db32 BulletSim: Redo parameter specification so only one place has 
to change to have a parameter show up in the ini file and
command line. Will make it much easier for the next person.
 2012-07-25 16:30:59 -07:00
Robert Adams 2d05e16f7e BulletSim: Add C# classes for storing and tracking constraints. 2012-07-25 16:30:55 -07:00
Robert Adams 5707e171f4 BulletSim: Move constraint tracking from C++ code to C# code 
for more flexibility.
 2012-07-25 16:30:50 -07:00