Remove GetFullPath call from config includes, because it barfs in Windoze
							parent
							
								
									4ee8d8a813
								
							
						
					
					
						commit
						d10f157183
					
				| 
						 | 
				
			
			@ -1155,10 +1155,7 @@ namespace OpenSim.Framework
 | 
			
		|||
 | 
			
		||||
                    string[] files = Directory.GetFiles(p, c);
 | 
			
		||||
                    foreach (string f in files)
 | 
			
		||||
                    {
 | 
			
		||||
                        m_log.InfoFormat("Adding file {0} to include list", f);
 | 
			
		||||
                        found.Add(f);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                paths = addpaths;
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -187,8 +187,7 @@ namespace OpenSim
 | 
			
		|||
                        else
 | 
			
		||||
                        {
 | 
			
		||||
                            m_log.InfoFormat("Adding {0} to configuration", Path.Combine(Util.configDir(), file));
 | 
			
		||||
                            string path = Path.GetFullPath(
 | 
			
		||||
                                    Path.Combine(Util.configDir(), file));
 | 
			
		||||
                            string path = Path.Combine(Util.configDir(), file);
 | 
			
		||||
                            string[] paths = Util.Glob(path);
 | 
			
		||||
                            foreach (string p in paths)
 | 
			
		||||
                            {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue