Line endings

This commit is contained in:
Latif Khalifa
2014-06-26 15:38:14 +02:00
parent d25dced6be
commit c9c4bfb6eb

View File

@@ -457,15 +457,15 @@ namespace OpenMetaverse
public static System.IO.Stream GetResourceStream(string resourceName, string searchPath)
{
if (searchPath != null)
{
Assembly gea = Assembly.GetEntryAssembly();
if (gea == null) gea = typeof (Helpers).Assembly;
string dirname = ".";
if (gea != null && gea.Location != null)
{
dirname = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(gea.Location), searchPath);
}
{
Assembly gea = Assembly.GetEntryAssembly();
if (gea == null) gea = typeof (Helpers).Assembly;
string dirname = ".";
if (gea != null && gea.Location != null)
{
dirname = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(gea.Location), searchPath);
}
string filename = System.IO.Path.Combine(dirname, resourceName);
try
{