diff options
| author | Robert Adams | 2014-09-03 21:21:01 -0700 |
|---|---|---|
| committer | Robert Adams | 2014-09-03 21:21:01 -0700 |
| commit | 47ac103df785e63a541fa9752fd4f0cea4947f16 (patch) | |
| tree | 819709c3d8c58db5d3d3af9b2495c3ceff36cf30 /share | |
| parent | Merge branch 'master' into bullet-2.82 (diff) | |
| parent | For processing outbound http requests in the XMLRPCModule, start the thread t... (diff) | |
| download | opensim-SC_OLD-47ac103df785e63a541fa9752fd4f0cea4947f16.zip opensim-SC_OLD-47ac103df785e63a541fa9752fd4f0cea4947f16.tar.gz opensim-SC_OLD-47ac103df785e63a541fa9752fd4f0cea4947f16.tar.bz2 opensim-SC_OLD-47ac103df785e63a541fa9752fd4f0cea4947f16.tar.xz | |
Merge branch 'master' into bullet-2.82
Diffstat (limited to '')
| -rwxr-xr-x | share/32BitLaunch/OpenSim.32BitLaunch.exe (renamed from bin/OpenSim.32BitLaunch.exe) | bin | 5632 -> 5632 bytes | |||
| -rw-r--r-- | share/32BitLaunch/OpenSim.32BitLaunch/Program.cs (renamed from OpenSim/Tools/OpenSim.32BitLaunch/Program.cs) | 0 | ||||
| -rw-r--r-- | share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs (renamed from OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs) | 0 | ||||
| -rw-r--r-- | share/32BitLaunch/README | 5 | ||||
| -rwxr-xr-x | share/32BitLaunch/Robust.32BitLaunch.exe (renamed from bin/Robust.32BitLaunch.exe) | bin | 5632 -> 5632 bytes | |||
| -rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/Program.cs (renamed from OpenSim/Tools/Robust.32BitLaunch/Program.cs) | 0 | ||||
| -rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs (renamed from OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs) | 0 | ||||
| -rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln (renamed from OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln) | 0 |
8 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSim.32BitLaunch.exe b/share/32BitLaunch/OpenSim.32BitLaunch.exe index 62c14af..62c14af 100755 --- a/bin/OpenSim.32BitLaunch.exe +++ b/share/32BitLaunch/OpenSim.32BitLaunch.exe | |||
| Binary files differ | |||
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs b/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs index 52806b8..52806b8 100644 --- a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs +++ b/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs | |||
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs b/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs index e81870f..e81870f 100644 --- a/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs +++ b/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs | |||
diff --git a/share/32BitLaunch/README b/share/32BitLaunch/README new file mode 100644 index 0000000..443cde0 --- /dev/null +++ b/share/32BitLaunch/README | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | Many issues appear in the support channels because of a misunderstanding of the use of these utilities. And through discussion at OpenSimulator Office Hours it was determined that these tools probably serve no useful purpose anymore. | ||
| 2 | |||
| 3 | Instead of removing them immediately, we move them here, for a time, in case there is a useful purpose that has escaped us during conversations. | ||
| 4 | |||
| 5 | If a need to compile these arises, the OpenSim.32BitLaunch and Robust.32BitLaunch directories may be placed under the ./OpenSim/Tools sources subdirectory, run the prebuild script and compile. | ||
diff --git a/bin/Robust.32BitLaunch.exe b/share/32BitLaunch/Robust.32BitLaunch.exe index affedb4..affedb4 100755 --- a/bin/Robust.32BitLaunch.exe +++ b/share/32BitLaunch/Robust.32BitLaunch.exe | |||
| Binary files differ | |||
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Program.cs b/share/32BitLaunch/Robust.32BitLaunch/Program.cs index 490414c..490414c 100644 --- a/OpenSim/Tools/Robust.32BitLaunch/Program.cs +++ b/share/32BitLaunch/Robust.32BitLaunch/Program.cs | |||
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs b/share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs index cf80f47..cf80f47 100644 --- a/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs +++ b/share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs | |||
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln b/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln index a48a2d3..a48a2d3 100644 --- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln +++ b/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln | |||