Compare commits
3 Commits
sv-1.8.7.8
...
sv-1.8.7.8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
31003f13af | ||
|
|
c1f39e167c | ||
|
|
0e28436aa9 |
@@ -375,7 +375,7 @@ LLTextEditor::~LLTextEditor()
|
||||
const std::string& LLTextEditor::getMenuSegmentUrl() const
|
||||
{
|
||||
auto segment = getSegmentAtLocalPos(mLastContextMenuX, mLastContextMenuY);
|
||||
auto style = segment->getStyle();
|
||||
auto style = segment ? segment->getStyle() : nullptr;
|
||||
return style ? style->getLinkHREF() : LLStringUtil::null;
|
||||
}
|
||||
|
||||
|
||||
@@ -545,7 +545,7 @@ void LLHoverView::updateText()
|
||||
}
|
||||
mText.push_back(line);
|
||||
|
||||
auto& objects = LLSelectMgr::getInstance()->getHoverObjects();
|
||||
auto objects = LLSelectMgr::getInstance()->getHoverObjects();
|
||||
|
||||
line.clear();
|
||||
S32 prim_count = objects->getObjectCount();
|
||||
|
||||
@@ -9403,7 +9403,7 @@ class ListIsNearby : public view_listener_t
|
||||
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
|
||||
{
|
||||
const auto&& id = LFIDBearer::getActiveSelectedID();
|
||||
gMenuHolder->findControl(userdata["control"].asString())->setValue(LFIDBearer::getActiveType() == LFIDBearer::OBJECT ? gObjectList.findObject(id) : is_nearby(id));
|
||||
gMenuHolder->findControl(userdata["control"].asString())->setValue(LFIDBearer::getActiveType() == LFIDBearer::OBJECT ? !!gObjectList.findObject(id) : is_nearby(id));
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user