[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp, 1.215, 1.216

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8566/src/libopenvrml/openvrml

Modified Files:
	browser.cpp 
Log Message:
Ensure the scene's URL is relative before trying to resolve it against that of the parent scene.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -C2 -d -r1.215 -r1.216
*** browser.cpp	25 May 2007 06:13:06 -0000	1.215
--- browser.cpp	31 May 2007 07:18:55 -0000	1.216
***************
*** 7229,7237 ****
      read_write_mutex::scoped_read_lock lock(this->url_mutex_);
      using std::string;
!     const string result = (this->parent_ && !this->url_.empty())
!                         ? string(uri(this->url_)
!                                  .resolve_against(uri(this->parent_->url())))
!                         : this->url_;
!     return result;
  }
  
--- 7229,7235 ----
      read_write_mutex::scoped_read_lock lock(this->url_mutex_);
      using std::string;
!     return (this->parent_ && !this->url_.empty() && relative(uri(this->url_)))
!         ? string(uri(this->url_).resolve_against(uri(this->parent_->url())))
!         : this->url_;
  }