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

indra/newview/llappviewer.cpp

@@ -1196,7 +1196,7 @@ bool LLAppViewer::mainLoop()
 				// Scan keyboard for movement keys.  Command keys and typing
 				// are handled by windows callbacks.  Don't do this until we're
 				// done initializing.  JC
-				if (gViewerWindow->mWindow->getVisible()
+				if (gViewerWindow->getWindow()->getVisible()
 					&& gViewerWindow->getActive()
 					&& !gViewerWindow->getWindow()->getMinimized()
 					&& LLStartUp::getStartupState() == STATE_STARTED
@@ -1282,7 +1282,7 @@ bool LLAppViewer::mainLoop()
 
 				// yield cooperatively when not running as foreground window
 				if (   gNoRender
-					   || (gViewerWindow && !gViewerWindow->mWindow->getVisible())
+					   || (gViewerWindow && !gViewerWindow->getWindow()->getVisible())
 						|| !gFocusMgr.getAppHasFocus())
 				{
 					// Sleep if we're not rendering, or the window is minimized.
@@ -2569,7 +2569,7 @@ bool LLAppViewer::initWindow()
 	
 	if (gSavedSettings.getBOOL("WindowMaximized"))
 	{
-		gViewerWindow->mWindow->maximize();
+		gViewerWindow->getWindow()->maximize();
 		gViewerWindow->getWindow()->setNativeAspectRatio(gSavedSettings.getF32("FullScreenAspectRatio"));
 	}
 
@@ -2607,7 +2607,7 @@ bool LLAppViewer::initWindow()
 	gViewerWindow->initBase();
 
 	// show viewer window
-	//gViewerWindow->mWindow->show();
+	//gViewerWindow->getWindow()->show();
 
 	LL_INFOS("AppInit") << "Window initialization done." << LL_ENDL;
 	return true;
@@ -2639,13 +2639,13 @@ void LLAppViewer::cleanupSavedSettings()
 
 	// save window position if not fullscreen
 	// as we don't track it in callbacks
-	BOOL fullscreen = gViewerWindow->mWindow->getFullscreen();
-	BOOL maximized = gViewerWindow->mWindow->getMaximized();
+	BOOL fullscreen = gViewerWindow->getWindow()->getFullscreen();
+	BOOL maximized = gViewerWindow->getWindow()->getMaximized();
 	if (!fullscreen && !maximized)
 	{
 		LLCoordScreen window_pos;
 
-		if (gViewerWindow->mWindow->getPosition(&window_pos))
+		if (gViewerWindow->getWindow()->getPosition(&window_pos))
 		{
 			gSavedSettings.setS32("WindowX", window_pos.mX);
 			gSavedSettings.setS32("WindowY", window_pos.mY);

indra/newview/llavataractions.cpp

@@ -898,5 +898,5 @@ void LLAvatarActions::copyUUIDs(const uuid_vec_t& ids)
 	}
 
 	if (!ids_string.empty())
-		gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(ids_string));
+		gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(ids_string));
 }

indra/newview/llfloateravatarlist.cpp

@@ -1296,7 +1296,7 @@ void LLFloaterAvatarList::onClickGetKey()
 
 	if (NULL == item) return;
 
-	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(item->getUUID().asString()));
+	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(item->getUUID().asString()));
 }
 
 void LLFloaterAvatarList::sendKeys()

indra/newview/llfloaterblacklist.cpp

@@ -197,7 +197,7 @@ void LLFloaterBlacklist::onClickCopyUUID(void* user_data)
 {
 	LLFloaterBlacklist* floaterp = (LLFloaterBlacklist*)user_data;
 	LLScrollListCtrl* list = floaterp->getChild<LLScrollListCtrl>("file_list");
-	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(list->getFirstSelected()->getColumn(0)->getValue().asString()));
+	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(list->getFirstSelected()->getColumn(0)->getValue().asString()));
 }
 // static
 void LLFloaterBlacklist::onClickRemove(void* user_data)

indra/newview/llfloaterteleporthistory.cpp

@@ -351,5 +351,5 @@ void LLFloaterTeleportHistory::onCopySLURL(void* data)
 
 	// get SLURL of the selected entry and copy it to the clipboard
 	std::string SLURL = self->mPlacesList->getFirstSelected()->getColumn(LIST_SLURL)->getValue().asString();
-	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(SLURL));
+	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(SLURL));
 }

indra/newview/llpanelavatar.cpp

@@ -1726,7 +1726,7 @@ void LLPanelAvatar::onClickGetKey(void *userdata)
 
 	llinfos << "Copy agent id: " << agent_id << llendl;
 
-	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(agent_id.asString()));
+	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(agent_id.asString()));
 }
 
 // static

indra/newview/llpaneldisplay.cpp

@@ -1010,8 +1010,8 @@ void LLPanelDisplay::onCommitAutoDetectAspect(const LLSD& value)
 		S32 denominator = 0;
 		
 		// clear any aspect ratio override
-		gViewerWindow->mWindow->setNativeAspectRatio(0.f);
-		fractionFromDecimal(gViewerWindow->mWindow->getNativeAspectRatio(), numerator, denominator);
+		gViewerWindow->getWindow()->setNativeAspectRatio(0.f);
+		fractionFromDecimal(gViewerWindow->getWindow()->getNativeAspectRatio(), numerator, denominator);
 
 		std::string aspect;
 		if (numerator != 0)
@@ -1020,12 +1020,12 @@ void LLPanelDisplay::onCommitAutoDetectAspect(const LLSD& value)
 		}
 		else
 		{
-			aspect = llformat("%.3f", gViewerWindow->mWindow->getNativeAspectRatio());
+			aspect = llformat("%.3f", gViewerWindow->getWindow()->getNativeAspectRatio());
 		}
 
 		mCtrlAspectRatio->setLabel(aspect);
 
-		ratio = gViewerWindow->mWindow->getNativeAspectRatio();
+		ratio = gViewerWindow->getWindow()->getNativeAspectRatio();
 		gSavedSettings.setF32("FullScreenAspectRatio", ratio);
 	}
 }

indra/newview/llpanelgroup.cpp

@@ -131,7 +131,7 @@ void LLPanelGroupTab::handleClickHelp()
 
 static void copy_group_profile_uri(const LLUUID& id)
 {
-	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring("secondlife:///app/group/"+id.asString()+"/about"));
+	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring("secondlife:///app/group/"+id.asString()+"/about"));
 }
 
 LLPanelGroup::LLPanelGroup(const LLUUID& group_id)

indra/newview/llpanelobject.cpp

@@ -2442,7 +2442,7 @@ void LLPanelObject::onCopyPos(void* user_data)
 	stringVec.append(shortfloat(newpos.mV[VZ]));
 	stringVec.append(">");
 
-	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(stringVec));
+	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(stringVec));
 }
 
 void LLPanelObject::onCopySize(void* user_data)
@@ -2459,7 +2459,7 @@ void LLPanelObject::onCopySize(void* user_data)
 	stringVec.append(shortfloat(newpos.mV[VZ]));
 	stringVec.append(">");
 
-	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(stringVec));
+	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(stringVec));
 }
 
 void LLPanelObject::onCopyRot(void* user_data)
@@ -2476,7 +2476,7 @@ void LLPanelObject::onCopyRot(void* user_data)
 	stringVec.append(shortfloat(newpos.mV[VZ]));
 	stringVec.append(">");
 
-	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(stringVec));
+	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(stringVec));
 }
 
 namespace

indra/newview/llpanelpermissions.cpp

@@ -1135,7 +1135,7 @@ void LLPanelPermissions::onClickCopyObjKey()
 			output.append(object->getID().asString());
 		}
 	}
-	if (!output.empty()) gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(output));
+	if (!output.empty()) gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(output));
 }
 
 ///----------------------------------------------------------------------------

indra/newview/llpreviewanim.cpp

@@ -331,7 +331,7 @@ void LLPreviewAnim::copyAnimID(void *userdata)
 
 	if(item)
 	{
-		gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(item->getAssetUUID().asString()));
+		gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(item->getAssetUUID().asString()));
 	}
 }
 // </edit>

indra/newview/llpreviewsound.cpp

@@ -291,7 +291,7 @@ void LLPreviewSound::copyUUID( void *userdata )
 
 	if(item )
 	{
-		gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(item->getAssetUUID().asString()));
+		gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(item->getAssetUUID().asString()));
 	}
 }
 // </edit>

indra/newview/llstartup.cpp

@@ -1883,7 +1883,7 @@ bool idle_startup()
 		// Make sure agent knows correct aspect ratio
 		// FOV limits depend upon aspect ratio so this needs to happen before initializing the FOV below
 		LLViewerCamera::getInstance()->setViewHeightInPixels(gViewerWindow->getWindowDisplayHeight());
-		if (gViewerWindow->mWindow->getFullscreen())
+		if (gViewerWindow->getWindow()->getFullscreen())
 		{
 			LLViewerCamera::getInstance()->setAspect(gViewerWindow->getDisplayAspectRatio());
 		}

indra/newview/lltoolgun.cpp

@@ -62,7 +62,7 @@ void LLToolGun::handleSelect()
 {
 	gViewerWindow->hideCursor();
 	gViewerWindow->moveCursorToCenter();
-	gViewerWindow->mWindow->setMouseClipping(TRUE);
+	gViewerWindow->getWindow()->setMouseClipping(TRUE);
 	mIsSelected = TRUE;
 }
 
@@ -70,7 +70,7 @@ void LLToolGun::handleDeselect()
 {
 	gViewerWindow->moveCursorToCenter();
 	gViewerWindow->showCursor();
-	gViewerWindow->mWindow->setMouseClipping(FALSE);
+	gViewerWindow->getWindow()->setMouseClipping(FALSE);
 	mIsSelected = FALSE;
 }
 

indra/newview/llviewerdisplay.cpp

@@ -214,7 +214,7 @@ void display_update_camera(bool tiling=false)
 // Write some stats to llinfos
 void display_stats()
 {
-	if (gNoRender || !gViewerWindow->mWindow->getVisible() || !gFocusMgr.getAppHasFocus())
+	if (gNoRender || !gViewerWindow->getWindow()->getVisible() || !gFocusMgr.getAppHasFocus())
 	{
 		// Do not keep FPS statistics while yielding cooperatively
 		// (i;e. when not running as foreground window)

indra/newview/llviewermenu.cpp

@@ -2618,7 +2618,7 @@ class LLObjectCopyUUID : public view_listener_t
 		LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
 		if(object)
 		{
-			gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(object->getID().asString()));
+			gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(object->getID().asString()));
 		}
 		return true;
 	}
@@ -3266,7 +3266,7 @@ class LLAvatarCopyUUID : public view_listener_t
 		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
 		if(!avatar) return true;
 		
-		gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(avatar->getID().asString()));
+		gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(avatar->getID().asString()));
 		return true;
 	}
 };
@@ -3278,7 +3278,7 @@ class LLAvatarClientUUID : public view_listener_t
 		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
 		if(!avatar) return true;
 		const LLUUID clientID = SHClientTagMgr::instance().getClientID(avatar);
-		gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(clientID.asString()));
+		gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(clientID.asString()));
 		return true;
 	}
 };

indra/newview/llviewerwindow.cpp

@@ -4454,7 +4454,7 @@ void LLViewerWindow::movieSize(S32 new_width, S32 new_height)
 		LLCoordScreen new_size(new_width + BORDERWIDTH, 
 							   new_height + BORDERHEIGHT);
 		BOOL disable_sync = gSavedSettings.getBOOL("DisableVerticalSync");
-		if (gViewerWindow->mWindow->getFullscreen())
+		if (gViewerWindow->getWindow()->getFullscreen())
 		{
 			LLGLState::checkStates();
 			LLGLState::checkTextureChannels();

indra/newview/llviewerwindow.h

@@ -234,7 +234,7 @@ public:
 	S32				getCurrentMouseDX()		const	{ return mCurrentMouseDelta.mX; }
 	S32				getCurrentMouseDY()		const	{ return mCurrentMouseDelta.mY; }
 	LLCoordGL		getCurrentMouseDelta()	const	{ return mCurrentMouseDelta; }
-	LLStat *		getMouseVelocityStat()		{ return &mMouseVelocityStat; }
+	LLStat*			getMouseVelocityStat()		{ return &mMouseVelocityStat; }
 	BOOL			getLeftMouseDown()	const	{ return mLeftMouseDown; }
 	BOOL			getMiddleMouseDown()	const	{ return mMiddleMouseDown; }
 	BOOL			getRightMouseDown()	const	{ return mRightMouseDown; }
@@ -406,12 +406,12 @@ private:
 	LLRect			getChatConsoleRect(); // Get optimal cosole rect.
 
 public:
-	LLWindow*		mWindow;						// graphical window object
 
 	void			unblockToolTips(){mToolTipBlocked = FALSE;}	//hack until LLToolTipMgr is ported.
 
 protected:
-	BOOL			mActive;
+	LLWindow*		mWindow;						// graphical window object
+	bool			mActive;
 	BOOL			mWantFullscreen;
 	BOOL			mShowFullscreenProgress;
 	LLRect			mWindowRectRaw;

indra/newview/llworldmapview.cpp

@@ -513,25 +513,7 @@ void LLWorldMapView::draw()
 				static const LLCachedControl<bool> show_avs("LiruMapShowAvCount");
 				if (show_avs) mesg += llformat(" (%d)", info->getAgentCount());
 
-				U8 access = info->getAccess();
-				switch(access)
-				{
-				case SIM_ACCESS_MIN:
-					mesg += " (Min)";
-					break;
-				case SIM_ACCESS_PG:
-					mesg += " (PG)";
-					break;
-				case SIM_ACCESS_MATURE:
-					mesg += " (Mature)";
-					break;
-				case SIM_ACCESS_ADULT:
-					mesg += " (Adult)";
-					break;
-				default:
-					mesg += llformat(" (Access=%d)",access);
-					break;
-				}
+				mesg += llformat(" (%s)", info->getAccessString().c_str());
 			}
 //			if (!mesg.empty())
 // [RLVa:KB] - Checked: 2012-02-08 (RLVa-1.4.5) | Added: RLVa-1.4.5

indra/newview/noise.h

@@ -316,6 +316,8 @@ static void normalize3(F32 v[3])
 
 static void init(void)
 {
+	// we want repeatable noise (e.g. for stable terrain texturing), so seed with known value
+	srand(42);
 	int i, j, k;
 
 	for (i = 0 ; i < B ; i++) {
@@ -346,6 +348,9 @@ static void init(void)
 		for (j = 0 ; j < 3 ; j++)
 			g3[B + i][j] = g3[i][j];
 	}
+
+	// reintroduce entropy
+	srand(time(NULL));		// Flawfinder: ignore
 }
 
 #undef B