summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaceinfo.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-03-08 10:54:23 -0800
committerJames Cook <james@lindenlab.com>2010-03-08 10:54:23 -0800
commit18ebacefcfb5909a58a213a97c6a687afe9b877e (patch)
tree5b48ebad64a253bd9aa50371c2308389cbec64bf /indra/newview/llpanelplaceinfo.h
parent34d1d34ca100fd137c2a85f0e0f330730fb70aba (diff)
parent42606dbbb5f452211e4fc30ee0ed41334fc14e8d (diff)
Merge with viewer 2 beta 4
Diffstat (limited to 'indra/newview/llpanelplaceinfo.h')
-rw-r--r--indra/newview/llpanelplaceinfo.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index deedbd2b0f..0d7a09b5de 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -102,9 +102,7 @@ public:
void createPick(const LLVector3d& pos_global, LLPanelPickEdit* pick_panel);
protected:
- static void nameUpdatedCallback(LLTextBox* text,
- const std::string& first,
- const std::string& last);
+ static void onNameCache(LLTextBox* text, const std::string& full_name);
/**
* mParcelID is valid only for remote places, in other cases it's null. See resetLocation()