[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.21.6-122-g0cd6f5f

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 22fd7cfae5fcede98ba2581af2ad7c1497ea9d3d
Merge: 21c4e7cf04d86adfb236a5474d7367d70877b755 1836a2bcbf5c4da354e770b8d1642afe3ce4a362
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Tue Apr 14 11:18:51 2009 +0100

    Merge branch 'upstream'

diff --combined indra/llmedia/llmediaimplexample1.cpp
index ad7b99e,910bbf7..b6b5b57
--- a/indra/llmedia/llmediaimplexample1.cpp
+++ b/indra/llmedia/llmediaimplexample1.cpp
@@@ -4,7 -4,7 +4,7 @@@
   *
   * $LicenseInfo:firstyear=2007&license=viewergpl$
   * 
-  * Copyright (c) 2007-2008, Linden Research, Inc.
+  * Copyright (c) 2007-2009, Linden Research, Inc.
   * 
   * Second Life Viewer Source Code
   * The source code in this file ("Source Code") is provided by Linden Lab
@@@ -38,8 -38,7 +38,8 @@@
  static LLMediaImplRegister sLLMediaImplExample1Reg( "LLMediaImplExample1", new LLMediaImplExample1Maker() );
  
  #include <iostream>
 -
 +#include <stdio.h>
 +#include <string.h>
  #include <time.h>
  
  ///////////////////////////////////////////////////////////////////////////////
diff --combined indra/llmedia/llmediaimplexample2.cpp
index e82406e,7bda982..6ca7b6f
--- a/indra/llmedia/llmediaimplexample2.cpp
+++ b/indra/llmedia/llmediaimplexample2.cpp
@@@ -4,7 -4,7 +4,7 @@@
   *
   * $LicenseInfo:firstyear=2007&license=viewergpl$
   * 
-  * Copyright (c) 2007-2008, Linden Research, Inc.
+  * Copyright (c) 2007-2009, Linden Research, Inc.
   * 
   * Second Life Viewer Source Code
   * The source code in this file ("Source Code") is provided by Linden Lab
@@@ -39,16 -39,13 +39,16 @@@ static LLMediaImplRegister sLLMediaImpl
  
  #include <iostream>
  #include <time.h>
 +#include <stdio.h>
 +#include <string.h>
 +
  
  ///////////////////////////////////////////////////////////////////////////////
  //
  LLMediaImplExample2Maker::LLMediaImplExample2Maker()
  {
  	// Register to handle the scheme
- 	mSchema.push_back( "example2" );
+ 	mSchema.push_back( "example2." );
  }
  
  ///////////////////////////////////////////////////////////////////////////////

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids