Merge branch 'SledjChisl'

5 files changed, 86 insertions, 5 deletions

diff --git a/BUILDING.md b/coderDocs/BUILDING.md
index d5770f3..233fa08 100644
--- a/BUILDING.md
+++ b/coderDocs/BUILDING.md
@@ -4,7 +4,7 @@ Steps:
  * runprebuild.bat
  * Load OpenSim.sln into Visual Studio .NET and build the solution.
  * chdir bin 
- * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in config/config-include
+ * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in ../../config/config-include
  * run OpenSim.exe
 
 # Building on Linux
@@ -21,7 +21,7 @@ From the distribution type:
  * ./runprebuild.sh
  * nant (or !* xbuild)
  * cd bin 
- * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in config/config-include
+ * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in ../../config/config-include
  * run mono OpenSim.exe
  !* xbuild option switches
  !*          clean:  xbuild /target:clean
@@ -44,6 +44,3 @@ Helpful resources:
 
  * xbuild /p:TargetFrameworkVersion="v4.5"
 
-For the shutdown hang, see -
-    http://opensimulator.org/mantis/view.php?id=7743
-        "Now for my purposes, I have replaced all instances of Environment.Exit, in ServicesServerBase.cs and BaseOpenSimServer.cs with System.Diagnostics.Process.GetCurrentProcess().Kill();"
diff --git a/coderDocs/README b/coderDocs/README
new file mode 100644
index 0000000..6e94d1e
--- /dev/null
+++ b/coderDocs/README
@@ -0,0 +1,14 @@
+README
+
+This directory does not currently contain any OpenSimulator user level
+documentation.  Such documentation can be found at http://opensimulator.org
+instead.
+
+Rather, this directory can contain source-code documentation as generated
+via the doxygen package, and some other coder level documentation.
+
+To do this, execute -
+
+doxygen doxygen.conf
+
+on the command line.
diff --git a/TESTING.txt b/coderDocs/TESTING.txt
index da9dd60..da9dd60 100644
--- a/TESTING.txt
+++ b/coderDocs/TESTING.txt
diff --git a/coderDocs/TODO.txt b/coderDocs/TODO.txt
new file mode 100644
index 0000000..e3288d5
--- /dev/null
+++ b/coderDocs/TODO.txt
@@ -0,0 +1,70 @@
+TODO on release
+---------------
+Update version numbers.
+git log 8f280962f019d46e0367b29246283a1e34ceb955.. --pretty=format:"%s%n%b%n----------------" > NEWS.new
+    That'll be up to and excluding that revision.
+Clean that up, merge it into NEWS.
+Tag and release.
+
+
+Still to do -
+-------------
+
+Clean up the configs.
+    Why do we have Include-Common, Include-modules, Include-osslEnable, Include-Architecture, Include-Storage, Include-*Cache ??????
+        It only looks for "Include-".
+    Maybe move bin/assets and bin/inventory out of tree as well?
+
+save iar password check.
+    Check against the users password, and all the gods passwords.
+
+osForceSit() add a popup asking permission.
+    And with the os*animation, ossetspeed, ...
+
+
+    There was a showstopper, forgot what it is.  lol
+
+
+
+Paths -
+-------
+
+cd /opt/opensim-0.9.0.1_MG/current/bin
+mono Robust.exe -inidirectory=/opt/opensim-0.9.0.1_MG/config/ROBUST
+mono OpenSim.exe -inidirectory=/opt/opensim-0.9.0.1_MG/config/sim05
+
+/usr/bin/mono /opt/opensim/current/bin/Robust.exe -logconfig=/opt/opensim/config/ROBUST/Robust.exe.config -inifile=/opt/opensim/config/ROBUST/Robust.ini
+
+
+        # When each .ini file is read, it's includes get added to the end of the list of .ini files to read
+        # -inimaster is read first, the defaults
+        # -inifile is read next, defaults to OpenSim.ini
+        # -inidirectory files are read next, in some random order
+        # include files are read last
+        #   This is the problem, coz files included from earlier get to overide later files.
+        #   Which is really against all that is holy.
+
+/usr/bin/mono /opt/opensim/current/bin/OpenSim.exe -logconfig=/opt/opensim/config/sim07/OpenSim.exe.config  -inifile=/opt/opensim/config/OpenSim.ini -inidirectory=/opt/opensim/config/sim07
+
+
+
+Old TODO
+--------
+
+FIX BUGS -
+
+Zarro boogs!
+
+
+NEW FEATURES -
+
+In [Startup] there is this -
+    ; To run a script every few minutes, set the script filename here
+    ; timer_Script = "filename"
+Could do things with that perhaps.
+
+
+In [Startup] there is this -
+    ; Simulator Stats URI
+    ; Enable JSON simulator data by setting a URI name (case sensitive)
+    ; Stats_URI = "jsonSimStats"
diff --git a/doc/doxygen.conf b/coderDocs/doxygen.conf
index 148de9c..148de9c 100644
--- a/doc/doxygen.conf
+++ b/coderDocs/doxygen.conf