summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-02-02 14:26:33 -0500
committerOz Linden <oz@lindenlab.com>2012-02-02 14:26:33 -0500
commit5b2dbbadf70ee33bfd288b6384ae0d51715488b1 (patch)
tree48d7678fbbca7359db17b472e3233c1d2874828b /indra/newview/llchathistory.cpp
parent03290257345c22f909cf1cfac3981e7e07820d21 (diff)
parent34408bed2644ff957502454f05c21c31fec90009 (diff)
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 42de47e777..f530d10ddc 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -621,7 +621,6 @@ void LLChatHistory::initFromParams(const LLChatHistory::Params& p)
panel_p.has_border = false;
panel_p.mouse_opaque = false;
panel_p.min_dim = 30;
- panel_p.max_dim = S32_MAX;
panel_p.auto_resize = true;
panel_p.user_resize = false;