[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp, 1.190.2.15, 1.190.2.16

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	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.190.2.15
retrieving revision 1.190.2.16
diff -C2 -d -r1.190.2.15 -r1.190.2.16
*** browser.cpp	27 Apr 2007 06:58:26 -0000	1.190.2.15
--- browser.cpp	31 May 2007 07:18:17 -0000	1.190.2.16
***************
*** 7122,7130 ****
      boost::mutex::scoped_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;
  }
  
--- 7122,7128 ----
      boost::mutex::scoped_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_;
  }