Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
This commit is contained in:
@@ -49,6 +49,7 @@ LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect,
|
|||||||
S32 max_text_length)
|
S32 max_text_length)
|
||||||
: LLNameUI(loading, rlv_sensitive, name_id, is_group)
|
: LLNameUI(loading, rlv_sensitive, name_id, is_group)
|
||||||
, LLLineEditor(name, rect, LLStringUtil::null, glfont, max_text_length)
|
, LLLineEditor(name, rect, LLStringUtil::null, glfont, max_text_length)
|
||||||
|
, mClickForProfile(click_for_profile)
|
||||||
{
|
{
|
||||||
if (!name_id.isNull())
|
if (!name_id.isNull())
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user