c846cefda9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of ssh://opensimulator.org/var/git/opensim  
							
							
							
						 
						
							2013-01-15 00:24:51 +00:00  
				
					
						
							
							
								 
						
							
							
								4e1ca890c2 
								
							
								 
							
						 
						
							
							
								
								BulletSim: fix not moving physical objects below terrain to over terrain.  
							
							... 
							
							
							
							Add locking on register prestep action list preventing potential race conditions.
Little comment and formatting changes. 
							
						 
						
							2013-01-14 15:46:46 -08:00  
				
					
						
							
							
								 
						
							
							
								7978b349bd 
								
							
								 
							
						 
						
							
							
								
								refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart instead of sometimes but not always looking it up.  
							
							
							
						 
						
							2013-01-14 23:19:47 +00:00  
				
					
						
							
							
								 
						
							
							
								8bf0a9f85d 
								
							
								 
							
						 
						
							
							
								
								BulletSim: disable center-of-mass computation for linksets until debugged. Move physical prim above ground if it is underground. Previously tried to correct by applying and up force but the prim would never go through the ground.  
							
							
							
						 
						
							2013-01-14 07:50:58 -08:00  
				
					
						
							
							
								 
						
							
							
								b263587e21 
								
							
								 
							
						 
						
							
							
								
								try to patch getmesh Throttle (test)  
							
							
							
						 
						
							2013-01-13 15:25:51 +00:00  
				
					
						
							
							
								 
						
							
							
								b924e333b7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'avination' into careminster  
							
							
							
						 
						
							2013-01-13 13:44:28 +00:00  
				
					
						
							
							
								 
						
							
							
								923e5df7ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2013-01-13 13:44:24 +00:00  
				
					
						
							
							
								 
						
							
							
								2eb0d8b617 
								
							
								 
							
						 
						
							
							
								
								add some sanity checking to HandleAgentRequestSit handler  
							
							
							
						 
						
							2013-01-13 13:43:59 +00:00  
				
					
						
							
							
								 
						
							
							
								2028787c0d 
								
							
								 
							
						 
						
							
							
								
								prevent potencial invalid refs  
							
							
							
						 
						
							2013-01-13 12:25:41 +00:00  
				
					
						
							
							
								 
						
							
							
								459fcd81c9 
								
							
								 
							
						 
						
							
							
								
								BulletSim: move center of gravity of linkset to its geometric center.  
							
							... 
							
							
							
							Necessitated allowing simulator and physical position of a body to
get out of sync since Bullet assumes that <0,0,0> is the center of mass.
Update DLLs and SOs for the UpdateChildTransform so positions of
  individual prim in a linkset can be implemented. 
							
						 
						
							2013-01-11 16:47:53 -08:00  
				
					
						
							
							
								 
						
							
							
								eacc2561d1 
								
							
								 
							
						 
						
							
							
								
								BulletSim: add osGetPhysicsEngineType() LSL function and update  
							
							... 
							
							
							
							the physics engines to return the name that is specified in the INI
file ("physics = XXX") as the type of engine.
This os function is a little different than the others in that it
does not throw an exception of one is not privilaged to use it.
It merely returns an empty string. 
							
						 
						
							2013-01-11 16:47:35 -08:00  
				
					
						
							
							
								 
						
							
							
								93adc4cb66 
								
							
								 
							
						 
						
							
							
								
								BulletSim: Add IsSelected attribute to physical objects. Have vehicles check to see if physical before trying to step. Replace vehicle gravity application. Previously relying on Bullet to apply gravity but since vehicles over-ride the velocity calculation, gravity never had a chance to accelerate the body down. Added AddForceImpulse as well as AddForce for those who need to apply immediate velocity updates. Use the impulse to apply the linear motion.  
							
							
							
						 
						
							2013-01-11 16:47:20 -08:00  
				
					
						
							
							
								 
						
							
							
								daacd4deed 
								
							
								 
							
						 
						
							
							
								
								Fix exception reporting in SceneObjectPart so it logs what the exception is rather than just saying it happened.  
							
							
							
						 
						
							2013-01-11 16:47:07 -08:00  
				
					
						
							
							
								 
						
							
							
								7e58bbaac6 
								
							
								 
							
						 
						
							
							
								
								BulletSim: Redo linear function coding so they can better interact. New algorithm for limitMotorUp that relies on going up when not colliding rather than distance from ground. Add parameter for turning on and off embedded source vehicle debugging.  
							
							
							
						 
						
							2013-01-11 16:46:53 -08:00  
				
					
						
							
							
								 
						
							
							
								98168edc29 
								
							
								 
							
						 
						
							
							
								
								BulletSim: remove double application of buoyancy. Centralize computation of buoyancy. Add motor angular debugging controls.  
							
							
							
						 
						
							2013-01-11 16:46:38 -08:00  
				
					
						
							
							
								 
						
							
							
								b592ec265b 
								
							
								 
							
						 
						
							
							
								
								BulletSim: fix the 'No recognised physics mesh found ...' error spew by remembering that the last asset fetch failed until the simulator resets the shape parameters.  
							
							
							
						 
						
							2013-01-11 16:44:34 -08:00  
				
					
						
							
							
								 
						
							
							
								6e9092421b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'ubitwork' into avination  
							
							
							
						 
						
							2013-01-11 23:52:48 +01:00  
				
					
						
							
							
								 
						
							
							
								fcf3960168 
								
							
								 
							
						 
						
							
							
								
								make sure keyframe rotations are normalized  
							
							
							
						 
						
							2013-01-11 20:25:12 +00:00  
				
					
						
							
							
								 
						
							
							
								a892dbba63 
								
							
								 
							
						 
						
							
							
								
								go back bypassing sog updates control (test)  
							
							
							
						 
						
							2013-01-11 18:18:22 +00:00  
				
					
						
							
							
								 
						
							
							
								d7f0bf04f6 
								
							
								 
							
						 
						
							
							
								
								update the last information sent in terse updates where they are sent to all  
							
							... 
							
							
							
							clients and not only on Scheduled sends 
							
						 
						
							2013-01-11 16:24:48 +00:00  
				
					
						
							
							
								 
						
							
							
								819f4b338d 
								
							
								 
							
						 
						
							
							
								
								remove redundant lastPhysGroupPos and lastPhysGroupRot checks  
							
							... 
							
							
							
							in SOG Update(). rootpart does more complet checks 
							
						 
						
							2013-01-11 16:02:14 +00:00  
				
					
						
							
							
								 
						
							
							
								1f9dbdf8b8 
								
							
								 
							
						 
						
							
							
								
								same for AngularVelocity. Use normal terse updates in place of sending  
							
							... 
							
							
							
							imediatly. If that's good for physics, needs to be good for this 
							
						 
						
							2013-01-11 14:16:45 +00:00  
				
					
						
							
							
								 
						
							
							
								756d53db5e 
								
							
								 
							
						 
						
							
							
								
								keyframe. Don't use group UpdateRotation since this enqueues a terse  
							
							... 
							
							
							
							update and we are sending them imediatly 
							
						 
						
							2013-01-11 13:39:14 +00:00  
				
					
						
							
							
								 
						
							
							
								72cc94cfbc 
								
							
								 
							
						 
						
							
							
								
								add some sanity checking to HandleAgentRequestSit handler  
							
							
							
						 
						
							2013-01-10 20:21:18 -08:00  
				
					
						
							
							
								 
						
							
							
								660d36a5b0 
								
							
								 
							
						 
						
							
							
								
								Implement a workaround solution for saving manual script state changes by the user before logout instead of wrongly removing the script early.  
							
							... 
							
							
							
							This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen.
This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event. 
							
						 
						
							2013-01-11 02:28:43 +00:00  
				
					
						
							
							
								 
						
							
							
								d4f340b96f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							
							
						 
						
							2013-01-11 02:18:01 +00:00  
				
					
						
							
							
								 
						
							
							
								f74915ed4f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs 
							
						 
						
							2013-01-11 02:13:10 +00:00  
				
					
						
							
							
								 
						
							
							
								05ac6d3209 
								
							
								 
							
						 
						
							
							
								
								Save attachments on detach/exit if a contained script state has been changed.  
							
							... 
							
							
							
							This involves making Attachments module listen for start/stop script changes.
It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it
This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim.
Not just in a state where their scripts have been stopped. 
							
						 
						
							2013-01-11 01:46:36 +00:00  
				
					
						
							
							
								 
						
							
							
								26347307ec 
								
							
								 
							
						 
						
							
							
								
								Fix a regression in the last few scene commands changes where setting these via the viewer estate dialog stopped working.  
							
							... 
							
							
							
							Forgot to register the new interface.
Also removes some code which got included by adpating an existing module. 
							
						 
						
							2013-01-11 00:08:52 +00:00  
				
					
						
							
							
								 
						
							
							
								f3a2bbbd93 
								
							
								 
							
						 
						
							
							
								
								Add "debug scene get" console command to list current scene options  
							
							
							
						 
						
							2013-01-10 23:56:11 +00:00  
				
					
						
							
							
								 
						
							
							
								a16ae5d7e3 
								
							
								 
							
						 
						
							
							
								
								Move scene debug commands into separate module.  Command changes from "debug scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings  
							
							
							
						 
						
							2013-01-10 23:49:48 +00:00  
				
					
						
							
							
								 
						
							
							
								983e458bb6 
								
							
								 
							
						 
						
							
							
								
								refactor: route the final scene backup through the same code that handles periodic backup  
							
							... 
							
							
							
							This is rather than making unnecessary duplicate checks that the SOG later performs again. 
							
						 
						
							2013-01-10 22:59:40 +00:00  
				
					
						
							
							
								 
						
							
							
								17f21ba9a0 
								
							
								 
							
						 
						
							
							
								
								minor: Capitalize GroupsModule command category  
							
							
							
						 
						
							2013-01-10 22:46:25 +00:00  
				
					
						
							
							
								 
						
							
							
								e65737be93 
								
							
								 
							
						 
						
							
							
								
								minor: add missing newline to "debug scene" console command  
							
							
							
						 
						
							2013-01-10 22:42:33 +00:00  
				
					
						
							
							
								 
						
							
							
								f566dc0618 
								
							
								 
							
						 
						
							
							
								
								Remove unimplemented "debug teleport" console command  
							
							
							
						 
						
							2013-01-10 22:42:12 +00:00  
				
					
						
							
							
								 
						
							
							
								701ca1e4b8 
								
							
								 
							
						 
						
							
							
								
								Add "debug scene pbackup true|false" console command.  This enables or disable periodic scene backup.  For debug purposes.  
							
							... 
							
							
							
							If false, scene is still saved on shutdown. 
							
						 
						
							2013-01-10 22:38:48 +00:00  
				
					
						
							
							
								 
						
							
							
								170d376967 
								
							
								 
							
						 
						
							
							
								
								On baked texture save, replace any HG ID with an ordinary asset ID so the HGAssetBroker doesn't try to save back to the avatar's originating region  
							
							
							
						 
						
							2013-01-10 01:45:56 +00:00  
				
					
						
							
							
								 
						
							
							
								3a495ccd56 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs 
							
						 
						
							2013-01-10 01:38:03 +00:00  
				
					
						
							
							
								 
						
							
							
								84407e322f 
								
							
								 
							
						 
						
							
							
								
								revert accidental change to MemoryWatchdog stat calculation in previous  b1b4687 
							
							
							
						 
						
							2013-01-10 01:30:00 +00:00  
				
					
						
							
							
								 
						
							
							
								aecb32b74e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'avination' into careminster  
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs 
							
						 
						
							2013-01-10 01:25:07 +00:00  
				
					
						
							
							
								 
						
							
							
								b1b4687250 
								
							
								 
							
						 
						
							
							
								
								Add "show script timers" command to show script timers.  For debug purposes.  
							
							... 
							
							
							
							Also, "show sensors" changes to "show script sensors". 
							
						 
						
							2013-01-10 00:57:49 +00:00  
				
					
						
							
							
								 
						
							
							
								a0000a034f 
								
							
								 
							
						 
						
							
							
								
								Add "show sensors" command to show script sensor information for debug purposes.  
							
							
							
						 
						
							2013-01-10 00:32:22 +00:00  
				
					
						
							
							
								 
						
							
							
								949da1d4af 
								
							
								 
							
						 
						
							
							
								
								Change IsRoot to use ReferenceEquals to prevent operator == messiness  
							
							
							
						 
						
							2013-01-09 20:07:21 +01:00  
				
					
						
							
							
								 
						
							
							
								b70d50edf2 
								
							
								 
							
						 
						
							
							
								
								fix llGetRot and parameters prim_rotation for attachments. Only on  
							
							... 
							
							
							
							LSL_api to avoid side effects for now 
							
						 
						
							2013-01-09 17:59:32 +00:00  
				
					
						
							
							
								 
						
							
							
								b528281018 
								
							
								 
							
						 
						
							
							
								
								stop endless loop in lGetLinkPrimitiveParams  
							
							
							
						 
						
							2013-01-09 17:01:09 +00:00  
				
					
						
							
							
								 
						
							
							
								27b0914681 
								
							
								 
							
						 
						
							
							
								
								Prevent a null ref in llGetLinkPrimiteveParams. Still not a fix for the real  
							
							... 
							
							
							
							issue. 
							
						 
						
							2013-01-09 16:01:00 +01:00  
				
					
						
							
							
								 
						
							
							
								7d519fde3b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'teravuswork' into avination  
							
							
							
						 
						
							2013-01-09 09:19:52 +01:00  
				
					
						
							
							
								 
						
							
							
								290dc274ec 
								
							
								 
							
						 
						
							
							
								
								minor: Remove unnecessary commented out code from last commit  c28a2f05 and fix up code comment  
							
							
							
						 
						
							2013-01-09 01:04:43 +00:00  
				
					
						
							
							
								 
						
							
							
								c28a2f05ca 
								
							
								 
							
						 
						
							
							
								
								minor: make spacing consistent in console help output  
							
							
							
						 
						
							2013-01-09 00:54:28 +00:00  
				
					
						
							
							
								 
						
							
							
								e4fad4a09d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim  
							
							
							
						 
						
							2013-01-09 00:21:43 +00:00