diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-26 22:28:18 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-26 22:28:18 +0300 |
| commit | 4080969968c5bac301d754e58ff938df6cbdb5a5 (patch) | |
| tree | 7350ad7b139bb994fc223e794cafccf306f62bc7 /indra/newview/lltoolpie.h | |
| parent | 8f35d638fbdbbdcf80ad1e6d826fd6161a0a2387 (diff) | |
SL-6109 Conflict resolution
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index c1c8718f7d..60159594c9 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -67,8 +67,8 @@ public: LLViewerObject* getClickActionObject() { return mClickActionObject; } LLObjectSelection* getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; } void resetSelection(); - void walkToClickedLocation(); - void teleportToClickedLocation(); + bool walkToClickedLocation(); + bool teleportToClickedLocation(); void stopClickToWalk(); static void selectionPropertiesReceived(); |