Line endings
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user