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

Address Issue 1381: Mouse look cross hair coloration

Browse Source 
Adds debug setting LiruCrosshairColor
This commit is contained in:
Inusaito Sayori
2014-02-07 14:59:03 -05:00
parent 3801949887
commit c4bfdcbeac
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/app_settings/settings.xml
View File

@@ -651,6 +651,22 @@
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>0</integer>
</map> </map>
<key>LiruCrosshairColor</key>
<map>
<key>Comment</key>
<string>Color of crosshairs in mouselook</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</map>
<key>LiruGridInTitle</key> <key>LiruGridInTitle</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

7
indra/newview/lltoolgun.cpp
View File

@@ -137,11 +137,14 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask)
void LLToolGun::draw() void LLToolGun::draw()
{ {
if( gSavedSettings.getBOOL("ShowCrosshairs") ) static const LLCachedControl<bool> show("ShowCrosshairs");
if (show)
{ {
LLUIImagePtr crosshair = LLUI::getUIImage("UIImgCrosshairsUUID"); LLUIImagePtr crosshair = LLUI::getUIImage("UIImgCrosshairsUUID");
static const LLCachedControl<LLColor4> color("LiruCrosshairColor");
crosshair->draw( crosshair->draw(
( gViewerWindow->getWorldViewRectScaled().getWidth() - crosshair->getWidth() ) / 2, ( gViewerWindow->getWorldViewRectScaled().getWidth() - crosshair->getWidth() ) / 2,
( gViewerWindow->getWorldViewRectScaled().getHeight() - crosshair->getHeight() ) / 2); ( gViewerWindow->getWorldViewRectScaled().getHeight() - crosshair->getHeight() ) / 2,
color);
} }
} }