aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'master' into bigmergeMelanie2011-11-066-11/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Make the AsyncSceneObjectDeleter send a list of kills. This will make largeMelanie2011-11-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | marquee-selected deletions of single prims or small link sets nearly instantaneous
| * | | | | Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-0610-51/+52
| | | | | | | | | | | | | | | | | | | | | | | | packet per prim. More to come as we change to make use of this.
* | | | | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵Melanie2011-11-062-4/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into bigmerge
| * | | | | | Small preformance tweakMelanie2011-11-061-1/+1
| | | | | | |
| * | | | | | Remove backup optimization that was causing prim contents to poofMelanie2011-11-051-3/+8
| | | | | | |
* | | | | | | Merge branch 'master' into bigmergeMelanie2011-11-063-3/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-062-2/+19
| |\ \ \ \ \
| | * | | | | HUD attachments: Removes some more messages sent to wrong clients.Snoopy Pfeffer2011-11-061-1/+10
| | | | | | |
| | * | | | | Damaged assets, especially appearance textures, could crash the region ↵Snoopy Pfeffer2011-11-061-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Allow HG and other scene presences not linked to a user account to function.Melanie2011-11-061-1/+4
| |/ / / / /
* | | | | | Break out the parts of ScenePresence that differ from coreMelanie2011-11-051-141/+146
| | | | | |
* | | | | | Merge branch 'master' into bigmergeMelanie2011-11-050-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix build breakMelanie2011-11-051-1/+1
| | | | | |
* | | | | | Fix up with core changesMelanie2011-11-052-57/+31
| | | | | |
* | | | | | Merge branch 'master' into bigmergeMelanie2011-11-053-10/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | | Remove spammy autopilot debugMelanie2011-11-051-3/+3
| | | | | |
| * | | | | Remove some left over debug and reverse experimental reordering of ifsMelanie2011-11-051-4/+2
| | | | | |
| * | | | | Remove enableprejump config option and associated code as this is nowMelanie2011-11-052-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | fully functional and cannot be disabled because that would break timings.
| * | | | | Porting the ScenePresenceAnimator from Avination. Jump and fall anims now workMelanie2011-11-052-87/+136
| | | | | | | | | | | | | | | | | | | | | | | | properly.
| * | | | | Change puvlic m_ variable to a getter propertyMelanie2011-11-051-1/+5
| | | | | |
| * | | | | ScenePresence part of the Avination animator fixes.Melanie2011-11-051-3/+58
| | | | | |
| * | | | | Chnaging the sit target adjustment to a more precise approximation of SL. ↵Melanie2011-11-051-24/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some small fixes ported from Avination. Some white space fixes.
* | | | | | Whitespace fix from coreMelanie2011-11-051-0/+1
| | | | | |
* | | | | | Harmonize with core and remove extraneous comments with no information in themMelanie2011-11-051-105/+39
| | | | | |
* | | | | | Change m_falling public to a getter property.Melanie2011-11-052-2/+6
| | | | | |
* | | | | | Adapt to the core SP reworkMelanie2011-11-052-2/+6
| | | | | |
* | | | | | Some more changes to catch up with coreMelanie2011-11-051-71/+49
| | | | | |
* | | | | | Remove unused and broken OffsetRotation from ScenePresenceMelanie2011-11-052-30/+5
| | | | | |
* | | | | | Some trivial changes to get closer to coreMelanie2011-11-051-12/+5
| | | | | |
* | | | | | Change comment formatting to match core for a cleaner diffMelanie2011-11-051-23/+23
| | | | | |
* | | | | | Replace our patched up, broken an rebroken sit code with the code fromMelanie2011-11-051-303/+106
| | | | | | | | | | | | | | | | | | | | | | | | core which has now matured beyond what we had.
* | | | | | Merge branch 'master' into bigmergeMelanie2011-11-055-32/+25
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | | add myself to the contributors.txtnebadon2011-11-051-0/+1
| | | | | |
| * | | | | Fix avatar height, removes the hip offset hacknebadon2011-11-052-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | Author: Mana Janus <mana@mjm-labs.com>
| * | | | | Multiple lines in welcome message use '\n' in the welcome message tonebadon2011-11-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | start a new line.
| * | | | | add Mana Janus and SpotOn3D to contributors.txt last patch was courtesynebadon2011-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | of Mana Janus I failed to mention that, sorry!
| * | | | | Don't rotate child prims, if only the root prim is rotated.nebadon2011-11-051-2/+2
| | | | | |
| * | | | | refactor: In sit code, compare against Vector3.Zero and Quaternion.Identity ↵Justin Clark-Casey (justincc)2011-11-051-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | instead of individual components of a vector/quat
* | | | | | Merge branch 'master' into bigmergeMelanie2011-11-056-8/+55
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-052-36/+12
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-052-1/+4
| | |\ \ \ \ \
| * | | | | | | Fix NPC sitting for prims without a sit target.Justin Clark-Casey (justincc)2011-11-054-14/+61
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Add comment for experimental effect of removing the Thread.Sleep(20) in ↵Justin Clark-Casey (justincc)2011-11-042-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ODEPrim.changevelocity()
* | | | | | | Merge branch 'master' into bigmergeMelanie2011-11-050-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Replacing te linking code with the code from Avination. Link sets prims are nowMelanie2011-11-052-36/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | numbered properly even when sets are linked to sets.
* | | | | | Merge branch 'master' into bigmergeMelanie2011-11-042-4/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | On standup, trigger the changed link script event after the avatar has been ↵Justin Clark-Casey (justincc)2011-11-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Stop llPushObject() from causing problems by adding force via a taint rather ↵Justin Clark-Casey (justincc)2011-11-041-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than directly. This isn't a perfect solution since there can be a race between the taint processing and taint setting, as force needs to be reset after processing. Needs careful locking in the future.
* | | | | | Merge branch 'master' into bigmergeMelanie2011-11-0427-238/+429
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
generated by cgit v1.1 at 2025-03-21 21:29:37 +0000