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

Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/skins/default/xui/en-us/strings.xml
This commit is contained in:
Siana Gearz
2012-08-09 03:04:13 +02:00
parent c84e145557 769a7b89d2
commit 7743843a27
41 changed files with 3358 additions and 2289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llview.h
View File

@@ -478,7 +478,7 @@ public:
/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect); // Display mToolTipMsg if no child handles it.
/*virtual*/ const std::string& getName() const;
/*virtual*/ const std::string& getName() const;
/*virtual*/ void onMouseCaptureLost();
/*virtual*/ BOOL hasMouseCapture();
/*virtual*/ BOOL isView(); // Hack to support LLFocusMgr