Attempt to locate SL client in LaunchSLClient under other Unices.

1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/WindowsConfig.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/WindowsConfig.cs
index df56bfe..7988d96 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/WindowsConfig.cs
+++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/WindowsConfig.cs
@@ -47,7 +47,7 @@ namespace LaunchSLClient
             string exe = regKey.GetValue("Exe").ToString();
             exeFlags = regKey.GetValue("Flags").ToString();
             exePath = regKey.GetValue("").ToString();
-            runLine = exePath + "\\" + exe;
+            runLine = Path.Combine(exePath, exe);
             Registry.LocalMachine.Flush();
             Registry.LocalMachine.Close();
         }
@@ -56,7 +56,14 @@ namespace LaunchSLClient
         {
             RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\OpenSim\OpenSim");
 
-            return key == null ? "" : key.GetValue("Path").ToString();
+            if (key == null)
+            {
+                return string.Empty;
+            }
+            else
+            {
+                return key.GetValue("Path").ToString();
+            }
         }
     }
 }