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

Fixups to mistakes of the past.

Browse Source
This commit is contained in:
Inusaito Sayori
2013-12-02 20:30:59 -05:00
parent 4116ac75f6
commit b4d0896507
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,7 +223,7 @@
<key>zmm_mlfov</key> <key>zmm_mlfov</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Adjusted when scrolling back and forth while holding rightclick in mouselook (Zoomed in < 1.037 < Zoomed out)</string> <string>Adjusted when scrolling back and forth while holding rightclick in mouselook (Zoomed in &lt; 1.037 &lt; Zoomed out)</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>

2
indra/newview/llfloaterfriends.cpp
View File

@@ -426,9 +426,11 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
friend_column["value"] = fullname; friend_column["value"] = fullname;
friend_column["font"] = "SANSSERIF"; friend_column["font"] = "SANSSERIF";
friend_column["font-style"] = "NORMAL"; friend_column["font-style"] = "NORMAL";
/* Singu TODO: Liru will fix this up to actually work later
static const LLCachedControl<LLColor4> sDefaultColor(gColors, "DefaultListText"); static const LLCachedControl<LLColor4> sDefaultColor(gColors, "DefaultListText");
static const LLCachedControl<LLColor4> sMutedColor("AscentMutedColor"); static const LLCachedControl<LLColor4> sMutedColor("AscentMutedColor");
friend_column["color"] = LLAvatarActions::isBlocked(agent_id) ? sMutedColor : sDefaultColor; friend_column["color"] = LLAvatarActions::isBlocked(agent_id) ? sMutedColor : sDefaultColor;
*/
LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS]; LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS];
online_status_column["column"] = "icon_online_status"; online_status_column["column"] = "icon_online_status";