Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

2013-02-03 22:27:53 +01:00
parent 064601ae5e 0a6bebf9db
commit dc3f91b121
500 changed files with 1323 additions and 115 deletions
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -337,10 +337,6 @@ public:
 	void calculateCameraDistance();

 	friend std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region);
-
-	// used by LCD to get details for debug screen
-	U32 getNetDetailsForLCD();
-	
    /// implements LLCapabilityProvider
    virtual std::string getDescription() const;
 	std::string getHttpUrl() const { return mHttpUrl ;}