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

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

Browse Source 
Conflicts:
	indra/newview/llviewerregion.cpp
This commit is contained in:
Shyotl
2015-06-26 20:38:43 -05:00
parent 09f4528bfb 1368cd6816
commit 1e488fef6d
108 changed files with 1129 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llnetmap.cpp
View File

@@ -939,7 +939,8 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& tool_tip, LLRect* stick
{
//tool_tip.append(fullName);
// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.0b
tool_tip.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullName : RlvStrings::getAnonym(fullName) );
if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMETAGS))
tool_tip.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullName : RlvStrings::getAnonym(fullName) );
// [/RLVa:KB]
// <singu> Use the radar for positioning, when possible.