diff options
| author | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
| commit | 5ff1687542240fe9b00d4c217b764770fc369c06 (patch) | |
| tree | bc5a1dbc882c19120ca00efb9914d70059cd79cb /linden/indra/newview/llchatbar.cpp | |
| parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
| parent | Removed grid stuff from World Map (for now). (diff) | |
| download | meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.zip meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.gz meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.bz2 meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.xz | |
Merge branch 'gridmanager' into next
Diffstat (limited to 'linden/indra/newview/llchatbar.cpp')
| -rw-r--r-- | linden/indra/newview/llchatbar.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp index 1de3690..403ab20 100644 --- a/linden/indra/newview/llchatbar.cpp +++ b/linden/indra/newview/llchatbar.cpp | |||
| @@ -120,6 +120,7 @@ LLChatBar::LLChatBar() | |||
| 120 | 120 | ||
| 121 | LLChatBar::~LLChatBar() | 121 | LLChatBar::~LLChatBar() |
| 122 | { | 122 | { |
| 123 | gGestureManager.removeObserver(mObserver); | ||
| 123 | delete mObserver; | 124 | delete mObserver; |
| 124 | mObserver = NULL; | 125 | mObserver = NULL; |
| 125 | // LLView destructor cleans up children | 126 | // LLView destructor cleans up children |