From c83d3d3521b9792326addb6538b7b43d3dee9ef2 Mon Sep 17 00:00:00 2001 From: Cinders Date: Sat, 16 Nov 2013 08:57:10 -0700 Subject: [PATCH] Trivial changes to contacts floater --- indra/newview/fscontactsfloater.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/fscontactsfloater.cpp b/indra/newview/fscontactsfloater.cpp index 2a6e4b7047..11516b374e 100644 --- a/indra/newview/fscontactsfloater.cpp +++ b/indra/newview/fscontactsfloater.cpp @@ -57,10 +57,10 @@ #include "lggcontactsetsfloater.h" //Maximum number of people you can select to do an operation on at once. -#define MAX_FRIEND_SELECT 20 -#define DEFAULT_PERIOD 5.0 -#define RIGHTS_CHANGE_TIMEOUT 5.0 -#define OBSERVER_TIMEOUT 0.5 +const S32 MAX_FRIEND_SELECT = 20; +const F32 DEFAULT_PERIOD = 5.f; +const F32 RIGHTS_CHANGE_TIMEOUT = 5.f; +const F32 OBSERVER_TIMEOUT = 0.5f; static const std::string FRIENDS_TAB_NAME = "friends_panel"; static const std::string GROUP_TAB_NAME = "groups_panel"; @@ -455,7 +455,7 @@ LLUUID FSFloaterContacts::getCurrentItemID() const else return LLUUID::null; } - if (cur_tab == GROUP_TAB_NAME) + else if (cur_tab == GROUP_TAB_NAME) { return mGroupList->getSelectedUUID(); }