aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-102-10/+15
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-102-10/+15
| |\
| | * convert tabs from commit 3758306 to spacesJustin Clark-Casey (justincc)2011-11-101-3/+6
| | |
| | * launch pCampbot shutdown console comand asynchronouslyJustin Clark-Casey (justincc)2011-11-101-2/+5
| | |
| | * Remove unused index parameter from BotManager.startupBot(). Rename ↵Justin Clark-Casey (justincc)2011-11-101-5/+4
| | | | | | | | | | | | startupBot() => StartBot()
| * | Fix misaligned sit animation on scripted sit caused by the default sitMelanie2011-11-101-2/+6
| |/ | | | | | | animation being run after the scripted one.
* | Fix misaligned sit animation on scripted sit caused by the default sitMelanie2011-11-101-2/+6
| | | | | | | | animation being run after the scripted one.
* | Merge branch 'master' into bigmergeMelanie2011-11-108-34/+50
|\ \ | |/
| * Add GuduleLapointe to list of contributorsBlueWall2011-11-101-0/+1
| | | | | | | | Thanks for the patches!
| * Allow custom setting for the console promptGuduleLapointe2011-11-102-2/+8
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * minor: Correct misleading method doc on SOG.UpdateRootRotation()Justin Clark-Casey (justincc)2011-11-091-1/+1
| |
| * Use IsConnected status to determine whether all pCampBots have disconnected, ↵Justin Clark-Casey (justincc)2011-11-092-16/+22
| | | | | | | | | | | | rather than maintaining a separate count Checking IsConnected is more reliable.
| * In pCampBot, don't try and pull down Primitive faces or sculpts set to nullJustin Clark-Casey (justincc)2011-11-091-6/+9
| |
| * one final attempt and then im giving up on panda!!!!!nebadon2011-11-071-2/+0
| |
| * yet another feeble attempt at understanding panda shmanda!nebadon2011-11-071-1/+0
| |
| * another shot at making panda use mono 2.4.3!!nebadon2011-11-071-0/+1
| |
| * another panda test for good measure!nebadon2011-11-071-1/+1
| |
| * This is a test to make sure new mono is being used with panda!nebadon2011-11-071-0/+2
| |
| * Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)2011-11-071-8/+6
| |
| * Correct test failure in sit position check of TestSitAndStandWithNoTarget()Justin Clark-Casey (justincc)2011-11-071-1/+3
| | | | | | | | | | | | Curiously, a Vector3.ToString() will not display the last two places of the float. In this case, the failure of the assertion would confusingly report Expected: <0, 0, 0.8454993> But was: <0, 0, 0.8454993> when actual Z figure is 0.845499337 Should fully address http://opensimulator.org/mantis/view.php?id=5779
* | Fix the ability to move the seated avatar via LSLMelanie2011-11-081-0/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-071-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * That such a trivial change can be so difficult to get right. Fix it this time.Melanie2011-11-071-1/+1
| |
| * Fix build breakMelanie2011-11-071-1/+1
| |
| * Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
| |
* | Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
| |
* | 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
| |
generated by cgit v1.1 at 2024-11-16 05:57:13 +0000