diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-23 15:40:02 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-23 15:40:02 +0300 |
| commit | d24a134df906d5a602bd939f48520bfdab08093b (patch) | |
| tree | ca209e70a1adbfb7875e74d6ce36c56409f6e597 /indra/newview/llscriptfloater.h | |
| parent | bb908fb73ee720898a22bda2119e3435992f0fef (diff) | |
| parent | b99c90daf38765161eafec418d52493761baf872 (diff) | |
Manual merge from default branch.
Semi-automatically resolved conflicts in:
* BuildParams
* indra/newview/CMakeLists.txt
* indra/newview/llviewermessage.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llscriptfloater.h')
| -rw-r--r-- | indra/newview/llscriptfloater.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h index ec3ec4b540..dc0cfc2400 100644 --- a/indra/newview/llscriptfloater.h +++ b/indra/newview/llscriptfloater.h @@ -99,6 +99,8 @@ public: bool getFloaterPosition(const LLUUID& object_id, FloaterPositionInfo& fpi); + void setFloaterVisible(const LLUUID& notification_id, bool visible); + protected: typedef std::map<std::string, EObjectType> object_type_map; |