summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryobserver.h
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-12-02 18:17:51 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-12-02 18:17:51 +0200
commitabb23ff31260e9632406dae03be920a23220d719 (patch)
treea24029245cf2ca511f3893e1b42e04ac3e9a90db /indra/newview/llinventoryobserver.h
parent9d8b189886ae14800d58f9729d8c8ea9b338ed52 (diff)
parentf496c2b164a100836d74909c3e27adcdf98018f0 (diff)
Manual merge from default branch.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventoryobserver.h')
-rw-r--r--indra/newview/llinventoryobserver.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
index 73b25a8ed0..4ee6c48cb1 100644
--- a/indra/newview/llinventoryobserver.h
+++ b/indra/newview/llinventoryobserver.h
@@ -63,7 +63,8 @@ public:
CALLING_CARD = 32, // online, grant status, cancel, etc change
ALL = 0xffffffff
};
- virtual ~LLInventoryObserver() {};
+ LLInventoryObserver();
+ virtual ~LLInventoryObserver();
virtual void changed(U32 mask) = 0;
std::string mMessageName; // used by Agent Inventory Service only. [DEV-20328]
};