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

18296 Commits (22ae9331bbe37c25a5099a05eb32ace7537ea46c)

Author SHA1 Message Date
Melanie e775b3fc47 Fix build break 2011-11-07 02:03:17 +00:00
Melanie 67780b00f0 Fix up failing test to compensate for changed sit target offset 2011-11-06 21:47:12 +00:00
Melanie 69322b84ce Fix up failing test to compensate for changed sit target offset 2011-11-06 21:46:03 +00:00
Melanie 323b76cee4 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2011-11-06 20:54:13 +00:00
Melanie 84a61cd00b Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge 2011-11-06 20:45:07 +00:00
Melanie 559e6e52f5 Make the AsyncSceneObjectDeleter send a list of kills. This will make large 
marquee-selected deletions of single prims or small link sets nearly
instantaneous
 2011-11-06 20:43:49 +00:00
Melanie c7dd7b13a2 Convert SendKillObject to take a list of uint rather than sending one 
packet per prim. More to come as we change to make use of this.
 2011-11-06 20:38:07 +00:00
Melanie 51bad0f8ae Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-11-06 20:12:57 +00:00
Melanie fa992a020c Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-11-06 20:00:47 +00:00
Melanie 0bf757e42b Allow HG and other scene presences not linked to a user account to function. 2011-11-06 20:00:03 +00:00
Melanie c9179be1ed Small preformance tweak 2011-11-06 20:16:24 +01:00
Snoopy Pfeffer 927561383e HUD attachments: Removes some more messages sent to wrong clients. 2011-11-06 17:43:39 +01:00
Snoopy Pfeffer dfbfc9826a Damaged assets, especially appearance textures, could crash the region server with a fatal exception. 
Now, such excpetions are caught by an exception handler and just an error message is shown.
This was the kind of exception causing these fatal server crashes:

  APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs^M
  ^M
  Exception: System.ArgumentOutOfRangeException: Argument is out of range.
  Parameter name: offset exceeds the size of buffer
    at System.Net.Sockets.NetworkStream.BeginRead (System.Byte[] buffer, Int32 offset, Int32 size, System.AsyncCallback callback, System.Object state) [0x00000] in <filename unknown>:0
    at HttpServer.HttpClientContext.OnReceive (IAsyncResult ar) [0x00000] in <filename unknown>:0 ^M
  ^M
  Application is terminating: True^M
 2011-11-06 15:05:19 +01:00
Melanie 89a1d7c37c Break out the parts of ScenePresence that differ from core 2011-11-05 23:37:43 +00:00
Melanie 1abb381c7a Merge branch 'master' into bigmerge 2011-11-05 23:12:23 +00:00
Melanie bd10d14bbd Fix build break 2011-11-05 23:12:00 +00:00
Melanie 57194facdc Fix up with core changes 2011-11-05 23:06:59 +00:00
Melanie facdc9c46e Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-11-05 22:56:08 +00:00
Melanie bbbcdaa462 Remove spammy autopilot debug 2011-11-05 22:54:47 +00:00
Melanie 9bded61ca4 Whitespace fix from core 2011-11-05 22:48:32 +00:00
Melanie 01b6a4b62e Remove some left over debug and reverse experimental reordering of ifs 2011-11-05 22:46:45 +00:00
Melanie 4d3926694d Remove enableprejump config option and associated code as this is now 
fully functional and cannot be disabled because that would break timings.
 2011-11-05 22:43:45 +00:00
Melanie 71388fc02a Porting the ScenePresenceAnimator from Avination. Jump and fall anims now work 
properly.
 2011-11-05 22:41:00 +00:00
Melanie 5517e21068 Harmonize with core and remove extraneous comments with no information in them 2011-11-05 22:34:36 +00:00
Melanie 534560df8c Remove backup optimization that was causing prim contents to poof 2011-11-05 23:31:20 +01:00
Melanie 8fb6ae379a Change m_falling public to a getter property. 2011-11-05 22:05:27 +00:00
Melanie 9c6025f928 Adapt to the core SP rework 2011-11-05 21:53:05 +00:00
Melanie ac3254a5f5 Change puvlic m_ variable to a getter property 2011-11-05 21:43:35 +00:00
Melanie 2dc452b4a7 ScenePresence part of the Avination animator fixes. 2011-11-05 21:41:16 +00:00
Melanie b6df9e9fe4 Chnaging the sit target adjustment to a more precise approximation of SL. Some small 
fixes ported from Avination. Some white space fixes.
 2011-11-05 21:24:36 +00:00
Melanie 0f279b1187 Some more changes to catch up with core 2011-11-05 21:23:25 +00:00
Melanie cc8e693fb9 Remove unused and broken OffsetRotation from ScenePresence 2011-11-05 20:39:43 +00:00
Melanie 506653ff00 Some trivial changes to get closer to core 2011-11-05 20:32:20 +00:00
Melanie 1a6b2a6429 Change comment formatting to match core for a cleaner diff 2011-11-05 20:17:02 +00:00
Melanie bda7b3dffe Replace our patched up, broken an rebroken sit code with the code from 
core which has now matured beyond what we had.
 2011-11-05 19:28:16 +01:00
Melanie 03f5bbcaf2 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-11-05 11:17:40 +00:00
Melanie 2cf6172689 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-11-05 11:05:32 +00:00
nebadon e8a8e462ed add myself to the contributors.txt 2011-11-05 03:03:57 -07:00
nebadon e182cc198d Fix avatar height, removes the hip offset hack 
Author: Mana Janus <mana@mjm-labs.com>
 2011-11-05 02:56:52 -07:00
nebadon 4797ed6edd Multiple lines in welcome message use '\n' in the welcome message to 
start a new line.
 2011-11-05 02:42:21 -07:00
nebadon f0d2fcfbe9 add Mana Janus and SpotOn3D to contributors.txt last patch was courtesy 
of Mana Janus I failed to mention that, sorry!
 2011-11-05 02:35:19 -07:00
nebadon e3885625a0 Don't rotate child prims, if only the root prim is rotated. 2011-11-05 02:26:25 -07:00
Justin Clark-Casey (justincc) cfce2529ad refactor: In sit code, compare against Vector3.Zero and Quaternion.Identity instead of individual components of a vector/quat 2011-11-05 02:04:48 +00:00
Justin Clark-Casey (justincc) 8105794121 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-11-05 01:42:20 +00:00
Justin Clark-Casey (justincc) 28c4dc9be4 Fix NPC sitting for prims without a sit target. 
This is to partially address http://opensimulator.org/mantis/view.php?id=5769
We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger.
By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>.
However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent).
Hopefully this can be addressed soon.
 2011-11-05 01:38:42 +00:00
Melanie b199aad037 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-11-05 00:11:10 +00:00
Melanie c3a23ffcdc Merge branch 'master' into bigmerge 2011-11-05 00:10:53 +00:00
Melanie c803ed28c3 Replacing te linking code with the code from Avination. Link sets prims are now 
numbered properly even when sets are linked to sets.
 2011-11-05 00:09:37 +00:00
Justin Clark-Casey (justincc) f7b8c54c24 Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPrim.changevelocity() 2011-11-04 23:43:17 +00:00
Justin Clark-Casey (justincc) d7815ace4a On standup, trigger the changed link script event after the avatar has been fully changed. 
This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work.
Probably the event is fired before the physics actor has been set up again for the stood avatar.
Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
 2011-11-04 23:24:22 +00:00