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/llpanelgroup.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/llpanelgroup.h')
| -rw-r--r-- | indra/newview/llpanelgroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h index 136868a60d..359f252383 100644 --- a/indra/newview/llpanelgroup.h +++ b/indra/newview/llpanelgroup.h @@ -37,7 +37,7 @@ #include "lltimer.h" #include "llvoiceclient.h" -struct LLOfferInfo; +class LLOfferInfo; const S32 UPDATE_MEMBERS_PER_FRAME = 500; |