Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trivial changes to better sync with viewer 3

Browse Source
This commit is contained in:
Drake Arconis
2013-08-25 14:14:51 -04:00
parent cdeea281cd
commit fdc855cd37
19 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llappviewer.cpp
View File

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

2
indra/newview/llavataractions.cpp
View File

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

2
indra/newview/llfloateravatarlist.cpp
View File

@@ -1296,7 +1296,7 @@ void LLFloaterAvatarList::onClickGetKey()
if (NULL == item) return; 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() void LLFloaterAvatarList::sendKeys()

2
indra/newview/llfloaterblacklist.cpp
View File

@@ -197,7 +197,7 @@ void LLFloaterBlacklist::onClickCopyUUID(void* user_data)
{ {
LLFloaterBlacklist* floaterp = (LLFloaterBlacklist*)user_data; LLFloaterBlacklist* floaterp = (LLFloaterBlacklist*)user_data;
LLScrollListCtrl* list = floaterp->getChild<LLScrollListCtrl>("file_list"); 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 // static
void LLFloaterBlacklist::onClickRemove(void* user_data) void LLFloaterBlacklist::onClickRemove(void* user_data)

2
indra/newview/llfloaterteleporthistory.cpp
View File

@@ -351,5 +351,5 @@ void LLFloaterTeleportHistory::onCopySLURL(void* data)
// get SLURL of the selected entry and copy it to the clipboard // get SLURL of the selected entry and copy it to the clipboard
std::string SLURL = self->mPlacesList->getFirstSelected()->getColumn(LIST_SLURL)->getValue().asString(); 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));
} }

2
indra/newview/llpanelavatar.cpp
View File

@@ -1726,7 +1726,7 @@ void LLPanelAvatar::onClickGetKey(void *userdata)
llinfos << "Copy agent id: " << agent_id << llendl; 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 // static

8
indra/newview/llpaneldisplay.cpp
View File

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

2
indra/newview/llpanelgroup.cpp
View File

@@ -131,7 +131,7 @@ void LLPanelGroupTab::handleClickHelp()
static void copy_group_profile_uri(const LLUUID& id) 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) LLPanelGroup::LLPanelGroup(const LLUUID& group_id)

6
indra/newview/llpanelobject.cpp
View File

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

2
indra/newview/llpanelpermissions.cpp
View File

@@ -1135,7 +1135,7 @@ void LLPanelPermissions::onClickCopyObjKey()
output.append(object->getID().asString()); 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));
} }
///---------------------------------------------------------------------------- ///----------------------------------------------------------------------------

2
indra/newview/llpreviewanim.cpp
View File

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

2
indra/newview/llpreviewsound.cpp
View File

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

2
indra/newview/llstartup.cpp
View File

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

4
indra/newview/lltoolgun.cpp
View File

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

2
indra/newview/llviewerdisplay.cpp
View File

@@ -214,7 +214,7 @@ void display_update_camera(bool tiling=false)
// Write some stats to llinfos // Write some stats to llinfos
void display_stats() 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 // Do not keep FPS statistics while yielding cooperatively
// (i;e. when not running as foreground window) // (i;e. when not running as foreground window)

6
indra/newview/llviewermenu.cpp
View File

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

2
indra/newview/llviewerwindow.cpp
View File

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

4
indra/newview/llviewerwindow.h
View File

@@ -406,12 +406,12 @@ private:
LLRect getChatConsoleRect(); // Get optimal cosole rect. LLRect getChatConsoleRect(); // Get optimal cosole rect.
public: public:
LLWindow* mWindow; // graphical window object
void unblockToolTips(){mToolTipBlocked = FALSE;} //hack until LLToolTipMgr is ported. void unblockToolTips(){mToolTipBlocked = FALSE;} //hack until LLToolTipMgr is ported.
protected: protected:
BOOL mActive; LLWindow* mWindow; // graphical window object
bool mActive;
BOOL mWantFullscreen; BOOL mWantFullscreen;
BOOL mShowFullscreenProgress; BOOL mShowFullscreenProgress;
LLRect mWindowRectRaw; LLRect mWindowRectRaw;

20
indra/plugins/filepicker/llfilepicker.cpp
View File

@@ -911,7 +911,7 @@ OSStatus LLFilePickerBase::doNavChooseDialog(ELoadFilter filter, std::string con
// (It is destroyed by NavDialogDispose() below.) // (It is destroyed by NavDialogDispose() below.)
error = NavCreateChooseFileDialog(&mNavOptions, NULL, eventProc, NULL, navOpenFilterProc, (void*)this, &navRef); error = NavCreateChooseFileDialog(&mNavOptions, NULL, eventProc, NULL, navOpenFilterProc, (void*)this, &navRef);
//gViewerWindow->mWindow->beforeDialog(); //gViewerWindow->getWindow()->beforeDialog();
if (error == noErr) if (error == noErr)
{ {
@@ -919,7 +919,7 @@ OSStatus LLFilePickerBase::doNavChooseDialog(ELoadFilter filter, std::string con
error = NavDialogRun(navRef); error = NavDialogRun(navRef);
} }
//gViewerWindow->mWindow->afterDialog(); //gViewerWindow->getWindow()->afterDialog();
if (error == noErr) if (error == noErr)
error = NavDialogGetReply(navRef, &navReply); error = NavDialogGetReply(navRef, &navReply);
@@ -1081,7 +1081,7 @@ OSStatus LLFilePickerBase::doNavSaveDialog(ESaveFilter filter, std::string const
} }
} }
//gViewerWindow->mWindow->beforeDialog(); //gViewerWindow->getWindow()->beforeDialog();
// Run the dialog // Run the dialog
if (error == noErr) if (error == noErr)
@@ -1090,7 +1090,7 @@ OSStatus LLFilePickerBase::doNavSaveDialog(ESaveFilter filter, std::string const
error = NavDialogRun(navRef); error = NavDialogRun(navRef);
} }
//gViewerWindow->mWindow->afterDialog(); //gViewerWindow->getWindow()->afterDialog();
if (error == noErr) if (error == noErr)
error = NavDialogGetReply(navRef, &navReply); error = NavDialogGetReply(navRef, &navReply);
@@ -1439,7 +1439,7 @@ bool LLFilePickerBase::getSaveFile(ESaveFilter filter, std::string const& filena
{ {
bool rtn = FALSE; bool rtn = FALSE;
//gViewerWindow->mWindow->beforeDialog(); //gViewerWindow->getWindow()->beforeDialog();
reset(); reset();
@@ -1524,7 +1524,7 @@ bool LLFilePickerBase::getSaveFile(ESaveFilter filter, std::string const& filena
rtn = (getFileCount() == 1); rtn = (getFileCount() == 1);
} }
//gViewerWindow->mWindow->afterDialog(); //gViewerWindow->getWindow()->afterDialog();
return rtn; return rtn;
} }
@@ -1533,7 +1533,7 @@ bool LLFilePickerBase::getLoadFile(ELoadFilter filter, std::string const& folder
{ {
bool rtn = FALSE; bool rtn = FALSE;
//gViewerWindow->mWindow->beforeDialog(); //gViewerWindow->getWindow()->beforeDialog();
reset(); reset();
@@ -1581,7 +1581,7 @@ bool LLFilePickerBase::getLoadFile(ELoadFilter filter, std::string const& folder
rtn = (getFileCount() == 1); rtn = (getFileCount() == 1);
} }
//gViewerWindow->mWindow->afterDialog(); //gViewerWindow->getWindow()->afterDialog();
return rtn; return rtn;
} }
@@ -1590,7 +1590,7 @@ bool LLFilePickerBase::getMultipleLoadFiles(ELoadFilter filter, std::string cons
{ {
bool rtn = FALSE; bool rtn = FALSE;
//gViewerWindow->mWindow->beforeDialog(); //gViewerWindow->getWindow()->beforeDialog();
reset(); reset();
@@ -1609,7 +1609,7 @@ bool LLFilePickerBase::getMultipleLoadFiles(ELoadFilter filter, std::string cons
rtn = !mFiles.empty(); rtn = !mFiles.empty();
} }
//gViewerWindow->mWindow->afterDialog(); //gViewerWindow->getWindow()->afterDialog();
return rtn; return rtn;
} }