diff options
author | Armin Weatherwax | 2010-02-07 22:18:11 +0100 |
---|---|---|
committer | Jacek Antonelli | 2010-02-18 20:18:08 -0600 |
commit | 9a0817e7ca7df49ed5a8bcf50d1ce535b9129df7 (patch) | |
tree | 5c1dc56cf8102ed9345f2e124c40ef1bfb434b8a | |
parent | Fixed #155: Double clicking your avatar triggers a TP request. (diff) | |
download | meta-impy-9a0817e7ca7df49ed5a8bcf50d1ce535b9129df7.zip meta-impy-9a0817e7ca7df49ed5a8bcf50d1ce535b9129df7.tar.gz meta-impy-9a0817e7ca7df49ed5a8bcf50d1ce535b9129df7.tar.bz2 meta-impy-9a0817e7ca7df49ed5a8bcf50d1ce535b9129df7.tar.xz |
Fixed #184: Previewing notecards resets camera.
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/newview/llpreviewnotecard.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 599184e..bdfcfa5 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -185,6 +185,11 @@ | |||
185 | 185 | ||
186 | 2010-02-07 Armin Weatherwax <Armin.Weatherwax@gmail.com> | 186 | 2010-02-07 Armin Weatherwax <Armin.Weatherwax@gmail.com> |
187 | 187 | ||
188 | * Fixed #184: Previewing notecards resets camera. | ||
189 | |||
190 | modified: newview/llpreviewnotecard.cpp | ||
191 | |||
192 | |||
188 | * Fixed #155: Double clicking your avatar triggers a TP request. | 193 | * Fixed #155: Double clicking your avatar triggers a TP request. |
189 | 194 | ||
190 | modified: linden/indra/newview/lltoolpie.cpp | 195 | modified: linden/indra/newview/lltoolpie.cpp |
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp index 897fd6a..976023f 100644 --- a/linden/indra/newview/llpreviewnotecard.cpp +++ b/linden/indra/newview/llpreviewnotecard.cpp | |||
@@ -145,8 +145,6 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name, | |||
145 | editor->setSourceID(item_id); | 145 | editor->setSourceID(item_id); |
146 | editor->setHandleEditKeysDirectly(TRUE); | 146 | editor->setHandleEditKeysDirectly(TRUE); |
147 | } | 147 | } |
148 | |||
149 | gAgent.changeCameraToDefault(); | ||
150 | } | 148 | } |
151 | 149 | ||
152 | LLPreviewNotecard::~LLPreviewNotecard() | 150 | LLPreviewNotecard::~LLPreviewNotecard() |