diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-15 15:41:51 -0500 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-15 15:41:51 -0500 |
commit | 08495d3f63e1e926e44185be07269ed40363024a (patch) | |
tree | 8e32278f96a14b36a4215e7fac16f68d072da961 /indra/newview/llfloaterregioninfo.cpp | |
parent | 870d4449f5eec1c2a7e5e4627a0433846ab256aa (diff) | |
parent | 06f8017674295191d3c4400eacb36e34a167ffa5 (diff) |
Merging in latest PE changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
-rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 381f4ed508..496fa62d05 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -48,7 +48,6 @@ #include "message.h" #include "llagent.h" -#include "llalertdialog.h" #include "llappviewer.h" #include "llfloateravatarpicker.h" #include "llbutton.h" @@ -63,7 +62,6 @@ #include "llfloaterwindlight.h" #include "llinventorymodel.h" #include "lllineeditor.h" -#include "llalertdialog.h" #include "llnamelistctrl.h" #include "llnotifications.h" #include "llnotificationsutil.h" |