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

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Browse Source 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml
This commit is contained in:
Siana Gearz
2012-03-28 22:27:45 +02:00
parent be9f3178c0 3d6511f4e1
commit f05edda4f4
264 changed files with 27606 additions and 15368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llwindow/llwindowsdl.cpp
View File

@@ -2512,6 +2512,11 @@ void LLWindowSDL::spawnWebBrowser(const std::string& escaped_url, bool async)
llinfos << "spawn_web_browser returning." << llendl;
}
void LLWindowSDL::setTitle(const std::string &title)
{
mWindowTitle = title;
SDL_WM_SetCaption(mWindowTitle.c_str(),mWindowTitle.c_str());
}
void *LLWindowSDL::getPlatformWindow()
{