ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-27 04:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,838 Commits 5 Branches 93 Tags
3a26e366d2829c2f66a8aa22158bd0905f0894de
Commit Graph

2724 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
6bd087a8f9 minor: remove some mono compiler warnings 2009-12-15 16:42:42 +00:00
Melanie
0813dc8c1d Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-12-14 00:32:00 +00:00
Melanie
c426549f53 Add an option to exit an instance rather than restarting a region within it 2009-12-14 00:31:15 +00:00
Adam Frisby
963cf25813 * Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level). 
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
 2009-12-13 03:04:16 +11:00
Teravus Ovares (Dan Olivares)
0639e90f56 * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations." 
* Turns out the new animator used a different movement bitflag then the one used in the code to autopilot the avatar
 2009-12-12 02:41:59 -05:00
Teravus Ovares (Dan Olivares)
35961caec6 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-12-12 01:24:25 -05:00
Kunnis
d89f3e9811 Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel 
Signed-off-by: Melanie <melanie@t-data.com>
 2009-12-12 04:44:32 +00:00
Teravus Ovares (Dan Olivares)
2f8b9cbf2b * Commit some sit code that's commented out for now. 2009-12-08 11:28:13 -05:00
Melanie
a44749b9d2 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-12-06 02:54:47 +00:00
Teravus Ovares (Dan Olivares)
8d196dbd14 * Adds Normal to the fields returned by the Physics Raycaster 
* Fixes recognizing when a sit target is and isn't set.
* * 1. Vector3.Zero.
* * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION
* * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion
* * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it
 2009-12-05 22:18:00 -05:00
Melanie
9453c42631 Experimental: Remove explicit property sends 2009-12-06 02:54:19 +00:00
Melanie
1a695875a7 Skip single prims in unlink selections 2009-12-06 02:54:09 +00:00
Melanie
f71025aeed Change locking to not mix explicit Monitor.* calls with lock() 2009-12-06 02:54:00 +00:00
Melanie
5259a32319 Remove extra forced updates. They're not needed for each prim. Really. 2009-12-06 02:53:50 +00:00
Melanie
46d5add175 Lock updates out while linking and unlinking 2009-12-06 02:53:42 +00:00
Melanie
e3a22ff37d Eliminate multiple updates on link/unlink 2009-12-06 02:53:34 +00:00
Teravus Ovares (Dan Olivares)
c4b6010fb3 * Fixes mantis 4416. Animator is dereferenced on logout 2009-12-05 13:01:21 -05:00
Justin Clark-Casey (justincc)
c0f3a4c833 Allow terrain heightmaps to be loaded directly from URIs via the remote admin plugin 
See http://opensimulator.org/mantis/view.php?id=4418
Thanks StrawberryFride
See
 2009-12-04 18:26:58 +00:00
Teravus Ovares (Dan Olivares)
781db43a76 * Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)]) 
* Adds a configurable maximum object mass before the mass is clamped.  Default is 10000.01.  Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section.
* Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations.  Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'.
 2009-12-03 20:21:10 -05:00
Teravus Ovares (Dan Olivares)
d9a20edfb0 * Move code from that last commit to LLClientView since it's a linden client specific limitation, it moves to the Linden Specific client handler. 2009-12-03 02:02:04 -05:00
Teravus Ovares (Dan Olivares)
af04cd1ae0 * If the position that comes in on Scene.SetHomeRezPoint has a component that is 255.5, replace the component with the user's position in the simulator. 
* Fixes mantis 4414: http://opensimulator.org/mantis/view.php?id=4414
 2009-12-03 01:50:54 -05:00
Justin Clark-Casey (justincc)
f7b2f0e61e Add position and region of prim items with missing assets in log reports 2009-12-02 18:15:33 +00:00
Melanie
5ee79c62bf Change default destination of deleted items to the trash folder. Everything 
else still goes to L&F
 2009-12-02 10:21:24 +00:00
Teravus Ovares (Dan Olivares)
d2c1610d17 * Test Autoconvert line ending on my repo.. 2009-12-01 11:35:32 -05:00
Teravus Ovares (Dan Olivares)
75e28b3a16 * Fix Inconsistent line ending style on Scene 2009-12-01 10:48:11 -05:00
Teravus Ovares (Dan Olivares)
7a2e8cb05f * Fix Inconsistent line ending style on ScenePresenceAnimator 2009-12-01 10:47:18 -05:00
Teravus Ovares (Dan Olivares)
56dca3b5a4 * Fix Inconsistent line ending style on SimStatsReporter 2009-12-01 10:45:36 -05:00
Teravus Ovares (Dan Olivares)
475d23741d * Fix Inconsistent line ending style in ScenePresence 2009-12-01 10:17:17 -05:00
Teravus Ovares (Dan Olivares)
83694e5578 * Add a close method to the ScenePresenceAnimator that dereferences the class variables and make the ScenePresence Close method call it. 2009-11-30 14:03:20 -05:00
Teravus Ovares (Dan Olivares)
0cb4ff1b68 * Modified ScenePresence to use the Util version of the EnvironmentTickCount method (and it's subtract method). Remove redundant EnvironmentTickCount definitions in ScenePresence. 2009-11-30 13:53:43 -05:00
Teravus Ovares (Dan Olivares)
4338f4e1d7 * Patch from Misterblue to fix Environment.TickCount for statistics purposes. Resolves the wrap-around of the 32 bit uint. 
* Teravus moved the Environment methods to the Util class
 2009-11-29 05:06:25 -05:00
Teravus Ovares (Dan Olivares)
e7333515d9 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-11-27 19:17:54 -05:00
Teravus Ovares (Dan Olivares)
8296413add * Re-enable lightweight packet tracking stats on a 3000 ms interval. 2009-11-27 19:17:36 -05:00
Justin Clark-Casey (justincc)
66f511c76a Remove unused GetDefaultAppearance() static function that is also available on AvatarFactoryModule 2009-11-27 19:45:33 +00:00
Melanie
b9eb244d6d Reset update flag when a SOG is deleted. This fixes llDie(); 2009-11-27 08:59:03 +00:00
Jeff Lee
d39c300d11 Added osGetRegionStats() function, to return a number of sim statistics 2009-11-26 17:43:00 +00:00
Melanie
41226dc991 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-11-26 17:05:48 +00:00
Melanie
9d63f90467 Remove the old (Remoting) region crossing code. Fix the new code to 
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
 2009-11-26 17:03:09 +00:00
Melanie
05fc504ff3 Remove the old remoting-type interregion code for prim/script crossing 2009-11-26 12:16:42 +00:00
Melanie
88842edc95 Remove GetAssemblyName and friends from the SE interface. It's now handled 
internally
 2009-11-26 12:08:20 +00:00
Teravus Ovares (Dan Olivares)
dac9c6fb23 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-11-25 14:13:51 -05:00
OpenSim Master
a3755d831d Patch: Fix a bug in LAND animation when the TickCount wraps into negative numbers 
by Mic Bowman
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
 2009-11-25 14:13:29 -05:00
Justin Clark-Casey (justincc)
59caa68e08 minor: add doc to a few parcel methods 2009-11-25 17:49:38 +00:00
Teravus Ovares (Dan Olivares)
a642968fd5 * Reverting last commit.. because it just made it worse. 2009-11-25 04:00:52 -05:00
Teravus Ovares (Dan Olivares)
abddb60b8d * Attempt number 1 to stop the repeating crouch animation that sometimes happens. 
* This tries to address it by correcting one potential bug where it never resets the falltimer.
* This tries to address it by telling Physics that we're not flying this step..  instead of waiting until the next step when the next agent update comes along.
 2009-11-25 02:51:11 -05:00
Justin Clark-Casey (justincc)
88ead9ee63 pass all command parameters to load/save oar, not just the filename 
unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
 2009-11-24 17:28:38 +00:00
Jeff Ames
9f5c2acd12 Formatting cleanup. 2009-11-23 11:26:06 +09:00
Teravus Ovares (Dan Olivares)
0ff3c28f90 * This doesn't fix mantis 3522, but it should mitigate it. 
* If the start position is outside of the region on the X and Y, put the user in the center of the region and then damp the Z position at 720 if necessary.  If the start position is not outside of the region on the X or Y, then don't check the Z.
 2009-11-22 20:21:33 -05:00
Teravus Ovares (Dan Olivares)
c155099faf * The client prevents the avatar from landing if the avatar is going above an unknown certain speed, so, add a speed check on the server. 
* This addresses the 'hump the prim' animation playing while you're moving forward full speed and pressing page down over a prim to land.
 2009-11-22 19:26:00 -05:00
Teravus Ovares (Dan Olivares)
f7916d10f3 * This fixes landing on Prim and removes the hack from yesterday. Landing on prim should work fine again. 2009-11-21 19:38:38 -05:00