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

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 9b7faa0e0759c3f1543ba94d4486846086046ebc
Merge: f14a84ac75594d99f35daad0ad1dbe052b5980b1 991d82fa10b91c2d0a96b9314349b336a5cd6830
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Tue Sep 2 20:38:18 2008 +0100

    Merge upstream 1.21.0 to master

diff --combined indra/llmedia/llmediaimplexample1.cpp
index 41e5c50,977d508..ad7b99e
--- a/indra/llmedia/llmediaimplexample1.cpp
+++ b/indra/llmedia/llmediaimplexample1.cpp
@@@ -32,12 -32,13 +32,14 @@@
  #include "llmediaimplexample1.h"
  #include "llmediaimplregister.h"
  
+ #include <cstring>
+ 
  // register this impl with media manager factory
  static LLMediaImplRegister sLLMediaImplExample1Reg( "LLMediaImplExample1", new LLMediaImplExample1Maker() );
  
  #include <iostream>
 -
 +#include <stdio.h>
 +#include <string.h>
  #include <time.h>
  
  ///////////////////////////////////////////////////////////////////////////////
diff --combined indra/llmedia/llmediaimplexample2.cpp
index ba1adcd,13036f9..e82406e
--- a/indra/llmedia/llmediaimplexample2.cpp
+++ b/indra/llmedia/llmediaimplexample2.cpp
@@@ -32,14 -32,13 +32,16 @@@
  #include "llmediaimplexample2.h"
  #include "llmediaimplregister.h"
  
+ #include <cstring>
+ 
  // register this impl with media manager factory
  static LLMediaImplRegister sLLMediaImplExample2Reg( "LLMediaImplExample2", new LLMediaImplExample2Maker() );
  
  #include <iostream>
  #include <time.h>
 +#include <stdio.h>
 +#include <string.h>
 +
  
  ///////////////////////////////////////////////////////////////////////////////
  //

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