From 717b11856ed61b9322503fcb6700e3c66d3a697e Mon Sep 17 00:00:00 2001 From: BlueWall Date: Fri, 7 Sep 2012 12:54:12 -0400 Subject: [PATCH 01/10] Move addin attributes to RegionCombinerModule.addin.xml Will help in automation of setting version info for addin dependencies. --- .../RegionCombinerModule/RegionCombinerModule.cs | 3 --- .../Resources/RegionCombinerModule.addin.xml | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 3144d76432..190fca0253 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs @@ -39,11 +39,8 @@ using OpenSim.Framework.Console; using OpenSim.Region.Physics.Manager; using Mono.Addins; -[assembly: Addin("RegionCombinerModule", "0.1")] -[assembly: AddinDependency("OpenSim", "0.5")] namespace OpenSim.Region.RegionCombinerModule { - [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] public class RegionCombinerModule : ISharedRegionModule, IRegionCombinerModule { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml new file mode 100644 index 0000000000..13cb8b6dc5 --- /dev/null +++ b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + From 46af3a3d92b754060e9ecca4e358d014c7738f23 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 6 Sep 2012 12:41:09 +0100 Subject: [PATCH 02/10] casing --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index a5dec245c4..8b9cf3103f 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Welcome to OpenSim! ================== -==== OVERVIEW ==== +==== Overview ==== ================== OpenSim is a BSD Licensed Open Source project to develop a functioning From 4e2805496cfbdb07e0bada2f9e36fcea0989c60d Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 6 Sep 2012 12:42:56 +0100 Subject: [PATCH 03/10] header syntax --- README.txt | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/README.txt b/README.txt index 8b9cf3103f..5b707da382 100644 --- a/README.txt +++ b/README.txt @@ -1,8 +1,6 @@ Welcome to OpenSim! -================== -==== Overview ==== -================== +# Overview OpenSim is a BSD Licensed Open Source project to develop a functioning virtual worlds server platform capable of supporting multiple clients @@ -12,16 +10,12 @@ C#, and can run under Mono or the Microsoft .NET runtimes. This is considered an alpha release. Some stuff works, a lot doesn't. If it breaks, you get to keep *both* pieces. -========================= -=== Compiling OpenSim === -========================= +# Compiling OpenSim Please see BUILDING.txt if you downloaded a source distribution and need to build OpenSim before running it. -================================== -=== Running OpenSim on Windows === -================================== +# Running OpenSim on Windows We recommend that you run OpenSim from a command prompt on Windows in order to capture any errors. @@ -33,9 +27,7 @@ To run OpenSim from a command prompt Now see the "Configuring OpenSim" section -================================ -=== Running OpenSim on Linux === -================================ +# Running OpenSim on Linux You will need Mono >= 2.4.3 to run OpenSim. On some Linux distributions you may need to install additional packages. See http://opensimulator.org/wiki/Dependencies @@ -48,9 +40,7 @@ To run OpenSim, from the unpacked distribution type: Now see the "Configuring OpenSim" section -=========================== -=== Configuring OpenSim === -=========================== +# Configuring OpenSim When OpenSim starts for the first time, you will be prompted with a series of questions that look something like: @@ -83,9 +73,7 @@ Helpful resources: * http://opensimulator.org/wiki/Configuration * http://opensimulator.org/wiki/Configuring_Regions -================================== -=== Connecting to your OpenSim === -================================== +# Connecting to your OpenSim By default your sim will be available for login on port 9000. You can login by adding -loginuri http://127.0.0.1:9000 to the command that starts Second Life @@ -96,9 +84,7 @@ http://192.168.1.2:9000) To login, use the avatar details that you gave for your estate ownership or the one you set up using the "create user" command. -=================== -=== Bug reports === -=================== +# Bug reports In the very likely event of bugs biting you (err, your OpenSim) we encourage you to see whether the problem has already been reported on @@ -119,9 +105,7 @@ mantis"). Useful information to include: mono --debug OpenSim.exe -=================================== -=== More Information on OpenSim === -=================================== +# More Information on OpenSim More extensive information on building, running, and configuring OpenSim, as well as how to report bugs, and participate in the OpenSim From 2ca93cb14416a320c97f2a42e3d29472ea717ead Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 6 Sep 2012 12:44:42 +0100 Subject: [PATCH 04/10] renaming to markdown file --- README.txt => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.txt => README.md (100%) diff --git a/README.txt b/README.md similarity index 100% rename from README.txt rename to README.md From ac90322f1bfd7fadb251261259b0ff5bcf89d5f6 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 6 Sep 2012 12:49:47 +0100 Subject: [PATCH 05/10] markdown-formatted link --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 5b707da382..3d7752d505 100644 --- a/README.md +++ b/README.md @@ -88,9 +88,7 @@ one you set up using the "create user" command. In the very likely event of bugs biting you (err, your OpenSim) we encourage you to see whether the problem has already been reported on -the OpenSim mantis system. You can find the OpenSim mantis system at - - http://opensimulator.org/mantis/main_page.php +the [OpenSim mantis system](http://opensimulator.org/mantis/main_page.php). If your bug has already been reported, you might want to add to the bug description and supply additional information. From 1acee36822e8138689ba847ee926beed18ad88f6 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 6 Sep 2012 12:50:01 +0100 Subject: [PATCH 06/10] code blocks --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d7752d505..78b7367562 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Now see the "Configuring OpenSim" section When OpenSim starts for the first time, you will be prompted with a series of questions that look something like: -[09-17 03:54:40] DEFAULT REGION CONFIG: Simulator Name [OpenSim Test]: + [09-17 03:54:40] DEFAULT REGION CONFIG: Simulator Name [OpenSim Test]: For all the options except simulator name, you can safely hit enter to accept the default if you want to connect using a client on the same machine or over @@ -62,7 +62,7 @@ in-world. You can also use these details to perform your first login. Once you are presented with a prompt that looks like: - Region (My region name) # + Region (My region name) # You have successfully started OpenSim. From a0e3e23aa9f6bd593d1c877446b205f300189656 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 6 Sep 2012 12:55:59 +0100 Subject: [PATCH 07/10] removing redundant header; this is the building.txt file for opensim --- BUILDING.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 12e5ea53cf..7d7bf3fbe1 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -1,5 +1,3 @@ -==== Building OpenSim ==== - === Building on Windows === Steps: From 783ecd01f490096b6727504972316a6de8c2de68 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 6 Sep 2012 12:58:14 +0100 Subject: [PATCH 08/10] headers --- BUILDING.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 7d7bf3fbe1..b14baa41c6 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -1,4 +1,4 @@ -=== Building on Windows === +# Building on Windows Steps: * runprebuild.bat @@ -7,7 +7,7 @@ Steps: * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include * run OpenSim.exe -=== Building on Linux === +# Building on Linux Prereqs: * Mono >= 2.4.3 @@ -25,13 +25,13 @@ From the distribution type: * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include * run mono OpenSim.exe -=== Using Monodevelop === +# Using Monodevelop From the distribution type: * ./runprebuild.sh * type monodevelop OpenSim.sln -=== References === +# References Helpful resources: * http://opensimulator.org/wiki/Build_Instructions From 740eac192bbfd56cb028ce28d5ac8942f3c4346b Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 6 Sep 2012 12:58:33 +0100 Subject: [PATCH 09/10] multi-paragraph list item --- BUILDING.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index b14baa41c6..5210b58f1f 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -10,13 +10,12 @@ Steps: # Building on Linux Prereqs: - * Mono >= 2.4.3 - * Nant >= 0.85 - * On some Linux distributions you may need to install additional packages. - See http://opensimulator.org/wiki/Dependencies for more information. - - * May also use xbuild (included in mono distributions) - * May use Monodevelop, a cross-platform IDE +* Mono >= 2.4.3 +* Nant >= 0.85 +* On some Linux distributions you may need to install additional packages. + See http://opensimulator.org/wiki/Dependencies for more information. +* May also use xbuild (included in mono distributions) +* May use Monodevelop, a cross-platform IDE From the distribution type: * ./runprebuild.sh From df3914c7cdc0aacde7110ba0dea4cd30f233aa7a Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 6 Sep 2012 12:59:28 +0100 Subject: [PATCH 10/10] renaming to markdown file --- BUILDING.txt => BUILDING.md | 0 README.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename BUILDING.txt => BUILDING.md (100%) diff --git a/BUILDING.txt b/BUILDING.md similarity index 100% rename from BUILDING.txt rename to BUILDING.md diff --git a/README.md b/README.md index 78b7367562..552cdef866 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If it breaks, you get to keep *both* pieces. # Compiling OpenSim -Please see BUILDING.txt if you downloaded a source distribution and +Please see BUILDING.md if you downloaded a source distribution and need to build OpenSim before running it. # Running OpenSim on Windows