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

19428 Commits (9870d7e4e787ca64011ef817ea2ab40310f4cf26)

Author SHA1 Message Date
Melanie e9055cec17 Merge branch 'master' into bigmerge 2011-11-10 23:44:19 +00:00
Justin Clark-Casey (justincc) c0d280d948 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-11-10 22:58:24 +00:00
Justin Clark-Casey (justincc) 2d4ac6288d Alter commit 3758306 to allow region name to be substituted within a region console prompt 
This is to allow broader subsitution in the future.  Currently, the only substitions are \R (for region name) and \\ (for a single backslash)
e.g. "Region (\R) " is the current and continuing default prompt
This renames custom_prompt in [Startup] to ConsolePrompt
 2011-11-10 22:56:13 +00:00
Melanie 008b213ec0 Fix turn left and turn right properly. Works for both built-ins and LSL AOs 2011-11-10 23:15:03 +01:00
Melanie 4939d99b57 Merge branch 'master' into bigmerge 2011-11-10 23:03:50 +00:00
Dan Lake f3fea81936 Merge branch 'master' of git://opensimulator.org/git/opensim 2011-11-10 14:09:53 -08:00
Dan Lake 18c625bda6 When updating SOG, a physics taint should not override a full update with a terse update 2011-11-10 14:09:35 -08:00
Melanie e7fed80e85 Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge 2011-11-10 22:35:41 +01:00
Melanie 81fbe7ffb1 Implement nudging support for strafing motion 2011-11-10 22:34:54 +01:00
Justin Clark-Casey (justincc) b990914ec4 convert tabs from commit 3758306 to spaces 2011-11-10 21:04:12 +00:00
Melanie cb7ea68942 Merge branch 'master' into bigmerge 2011-11-10 20:56:44 +00:00
Melanie 444b345cdf Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-11-10 20:54:44 +00:00
Melanie 48d2300b8a Fix misaligned sit animation on scripted sit caused by the default sit 
animation being run after the scripted one.
 2011-11-10 20:54:15 +00:00
Justin Clark-Casey (justincc) 9cba179dff launch pCampbot shutdown console comand asynchronously 2011-11-10 20:03:36 +00:00
Justin Clark-Casey (justincc) f31a58bd99 Remove unused index parameter from BotManager.startupBot(). Rename startupBot() => StartBot() 2011-11-10 19:40:45 +00:00
Melanie 063920e0a2 Fix misaligned sit animation on scripted sit caused by the default sit 
animation being run after the scripted one.
 2011-11-10 20:26:14 +01:00
Melanie a1426739a2 Merge branch 'master' into bigmerge 2011-11-10 17:35:35 +00:00
BlueWall ce4560bf8f Add GuduleLapointe to list of contributors 
Thanks for the patches!
 2011-11-10 07:26:16 -05:00
GuduleLapointe 37583063ee Allow custom setting for the console prompt 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2011-11-10 06:56:32 -05:00
Justin Clark-Casey (justincc) 4f6915bad5 minor: Correct misleading method doc on SOG.UpdateRootRotation() 2011-11-09 21:49:08 +00:00
Justin Clark-Casey (justincc) bbab7b6b4d Use IsConnected status to determine whether all pCampBots have disconnected, rather than maintaining a separate count 
Checking IsConnected is more reliable.
 2011-11-09 21:23:23 +00:00
Justin Clark-Casey (justincc) 674b521fdd In pCampBot, don't try and pull down Primitive faces or sculpts set to null 2011-11-09 20:21:48 +00:00
Melanie d40d0e4596 Fix the ability to move the seated avatar via LSL 2011-11-08 23:15:09 +01:00
nebadon d9b0d7e752 one final attempt and then im giving up on panda!!!!! 2011-11-07 19:03:09 -07:00
nebadon 4f7fe58af8 yet another feeble attempt at understanding panda shmanda! 2011-11-07 18:15:21 -07:00
nebadon 554d2ddc03 another shot at making panda use mono 2.4.3!! 2011-11-07 17:49:05 -07:00
nebadon 5d8205f170 another panda test for good measure! 2011-11-07 17:39:08 -07:00
nebadon c081d7b7dd This is a test to make sure new mono is being used with panda! 2011-11-07 17:09:32 -07:00
Justin Clark-Casey (justincc) 7e488cd635 Remove unused avariable in PollServiceRequestManager 2011-11-07 23:24:13 +00:00
Justin Clark-Casey (justincc) 39b967e214 Correct test failure in sit position check of TestSitAndStandWithNoTarget() 
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
 2011-11-07 22:53:52 +00:00
Melanie adbc69bb07 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
 2011-11-07 02:41:56 +00:00
Melanie 6d92d65140 That such a trivial change can be so difficult to get right. Fix it this time. 2011-11-07 02:40:35 +00:00
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