summaryrefslogtreecommitdiff
path: root/indra/newview/llcallingcard.cpp
diff options
context:
space:
mode:
authorSamuel Kolb <skolb@lindenlab.com>2009-12-16 12:04:38 -0800
committerSamuel Kolb <skolb@lindenlab.com>2009-12-16 12:04:38 -0800
commitbedde40e9475f3772807b6fc48c3039d5993f578 (patch)
treeae615503b4c917667a5a0b752dd0a6eca2927e9b /indra/newview/llcallingcard.cpp
parentd7533a2c0646826088d5c1f58c84604c0607b8aa (diff)
parent0c0cb6fd79d12016b32bb74ce0e9d2c656143902 (diff)
local merge
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
-rw-r--r--indra/newview/llcallingcard.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 714bd20ab8..82413878ad 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -55,7 +55,6 @@
#include "llinventorymodel.h"
#include "llnotifications.h"
#include "llnotificationsutil.h"
-#include "llnotify.h"
#include "llresmgr.h"
#include "llimview.h"
#include "llviewercontrol.h"