1 files changed, 11 insertions, 10 deletions
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index 7190bccb81..5dea46843c 100644
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -47,16 +47,16 @@
 
 LLFloaterInspect::LLFloaterInspect(const LLSD& key)
   : LLFloater(key),
-    mDirty(FALSE),
+    mDirty(false),
     mOwnerNameCacheConnection(),
     mCreatorNameCacheConnection()
 {
-    mCommitCallbackRegistrar.add("Inspect.OwnerProfile",    boost::bind(&LLFloaterInspect::onClickOwnerProfile, this));
-    mCommitCallbackRegistrar.add("Inspect.CreatorProfile",  boost::bind(&LLFloaterInspect::onClickCreatorProfile, this));
-    mCommitCallbackRegistrar.add("Inspect.SelectObject",    boost::bind(&LLFloaterInspect::onSelectObject, this));
+    mCommitCallbackRegistrar.add("Inspect.OwnerProfile",    { boost::bind(&LLFloaterInspect::onClickOwnerProfile, this) });
+    mCommitCallbackRegistrar.add("Inspect.CreatorProfile",  { boost::bind(&LLFloaterInspect::onClickCreatorProfile, this) });
+    mCommitCallbackRegistrar.add("Inspect.SelectObject",    { boost::bind(&LLFloaterInspect::onSelectObject, this) });
 }
 
-BOOL LLFloaterInspect::postBuild()
+bool LLFloaterInspect::postBuild()
 {
     mObjectList = getChild<LLScrollListCtrl>("object_list");
 //  childSetAction("button owner",onClickOwnerProfile, this);
@@ -65,7 +65,7 @@ BOOL LLFloaterInspect::postBuild()
 
     refresh();
 
-    return TRUE;
+    return true;
 }
 
 LLFloaterInspect::~LLFloaterInspect(void)
@@ -89,13 +89,13 @@ LLFloaterInspect::~LLFloaterInspect(void)
     }
     else
     {
-        LLFloaterReg::showInstance("build", LLSD(), TRUE);
+        LLFloaterReg::showInstance("build", LLSD(), true);
     }
 }
 
 void LLFloaterInspect::onOpen(const LLSD& key)
 {
-    BOOL forcesel = LLSelectMgr::getInstance()->setForceSelection(TRUE);
+    bool forcesel = LLSelectMgr::getInstance()->setForceSelection(true);
     LLToolMgr::getInstance()->setTransientTool(LLToolCompInspect::getInstance());
     LLSelectMgr::getInstance()->setForceSelection(forcesel);    // restore previouis value
     mObjectSelection = LLSelectMgr::getInstance()->getSelection();
@@ -220,7 +220,8 @@ void LLFloaterInspect::refresh()
         }
 
         time_t timestamp = (time_t) (obj->mCreationDate/1000000);
-        std::string timeStr = getString("timeStamp");
+        static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+        std::string timeStr = use_24h ? getString("timeStamp") : getString("timeStampAMPM");
         LLSD substitution;
         substitution["datetime"] = (S32) timestamp;
         LLStringUtil::format (timeStr, substitution);
@@ -345,7 +346,7 @@ void LLFloaterInspect::draw()
     if (mDirty)
     {
         refresh();
-        mDirty = FALSE;
+        mDirty = false;
     }
 
     LLFloater::draw();