Skip to content
Snippets Groups Projects
Commit 9abfaaf2 authored by Drake Arconis's avatar Drake Arconis
Browse files

Murrge

parents a3e65854 cab52c67
No related branches found
No related tags found
No related merge requests found
...@@ -481,7 +481,7 @@ attributedStringInfo getSegments(NSAttributedString *str) ...@@ -481,7 +481,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange - (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
{ {
if ([aString class] == NSClassFromString(@"NSConcreteMutableAttributedString")) if ([aString isKindOfClass:NSClassFromString(@"NSConcreteMutableAttributedString")])
{ {
if (mMarkedTextAllowed) if (mMarkedTextAllowed)
{ {
......
...@@ -696,6 +696,7 @@ void LLPanelProfileLegacy::LLPanelProfilePicks::openPickInfo() ...@@ -696,6 +696,7 @@ void LLPanelProfileLegacy::LLPanelProfilePicks::openPickInfo()
if (selected_value.isUndefined()) return; if (selected_value.isUndefined()) return;
LLPickItem* pick = static_cast<LLPickItem*>(mPicksList->getSelectedItem()); LLPickItem* pick = static_cast<LLPickItem*>(mPicksList->getSelectedItem());
if (!pick) return;
LLSD params; LLSD params;
params["pick_id"] = pick->getPickId(); params["pick_id"] = pick->getPickId();
params["avatar_id"] = pick->getCreatorId(); params["avatar_id"] = pick->getCreatorId();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment