diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpathfindingcharacters.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llfloaterpathfindingcharacters.h | 3 | ||||
| -rw-r--r-- | indra/newview/llpathfindingcharacter.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml | 9 |
5 files changed, 16 insertions, 9 deletions
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp index 021b48f0a0..86b7e86f9e 100644 --- a/indra/newview/llfloaterpathfindingcharacters.cpp +++ b/indra/newview/llfloaterpathfindingcharacters.cpp @@ -187,7 +187,7 @@ void LLFloaterPathfindingCharacters::sendCharactersDataGetRequest() std::string charactersDataURL = getCapabilityURL();
if (charactersDataURL.empty())
{
- setMessagingState(kMessagingComplete);
+ setMessagingState(kMessagingServiceNotAvailable);
llwarns << "cannot query pathfinding characters from current region '" << getRegionName() << "'" << llendl;
}
else
@@ -235,7 +235,7 @@ std::string LLFloaterPathfindingCharacters::getCapabilityURL() const LLViewerRegion* region = gAgent.getRegion();
if (region != NULL)
{
- charactersDataURL = region->getCapability("ObjectNavMeshProperties");
+ charactersDataURL = region->getCapability("CharacterProperties");
}
return charactersDataURL;
@@ -431,6 +431,10 @@ void LLFloaterPathfindingCharacters::updateCharactersStatusMessage() statusText = getString("characters_messaging_complete_available", string_args);
}
break;
+ case kMessagingServiceNotAvailable:
+ statusText = getString("characters_messaging_service_not_available");
+ styleParams.color = warningColor;
+ break;
default:
statusText = getString("characters_messaging_initial");
llassert(0);
diff --git a/indra/newview/llfloaterpathfindingcharacters.h b/indra/newview/llfloaterpathfindingcharacters.h index 6264c5d27a..ae3a34f459 100644 --- a/indra/newview/llfloaterpathfindingcharacters.h +++ b/indra/newview/llfloaterpathfindingcharacters.h @@ -57,7 +57,8 @@ public: kMessagingFetchRequestSent_MultiRequested,
kMessagingFetchReceived,
kMessagingFetchError,
- kMessagingComplete
+ kMessagingComplete,
+ kMessagingServiceNotAvailable
} EMessagingState;
virtual BOOL postBuild();
diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp index efbb3606e1..99e23c546f 100644 --- a/indra/newview/llpathfindingcharacter.cpp +++ b/indra/newview/llpathfindingcharacter.cpp @@ -33,8 +33,8 @@ #define CHARACTER_NAME_FIELD "name"
#define CHARACTER_DESCRIPTION_FIELD "description"
-#define CHARACTER_OWNER_FIELD "description"
-#define CHARACTER_CPU_TIME_FIELD "landimpact"
+#define CHARACTER_OWNER_FIELD "owner"
+#define CHARACTER_CPU_TIME_FIELD "cpu_time"
#define CHARACTER_POSITION_FIELD "position"
//---------------------------------------------------------------------------
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index cc4cac4202..ffad4d89ba 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1491,6 +1491,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) { capabilityNames.append("AttachmentResources"); capabilityNames.append("AvatarPickerSearch"); + capabilityNames.append("CharacterProperties"); capabilityNames.append("ChatSessionRequest"); capabilityNames.append("CopyInventoryFromNotecard"); capabilityNames.append("CreateInventoryCategory"); diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml index 9ae28d6a15..5938342556 100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml @@ -19,6 +19,7 @@ <floater.string name="characters_messaging_fetch_error">Error detected while querying for pathfinding characters</floater.string> <floater.string name="characters_messaging_complete_none_found">No pathfinding characters</floater.string> <floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL]</floater.string> + <floater.string name="characters_messaging_service_not_available">Required capability is not available in current region</floater.string> <scroll_list column_padding="0" draw_heading="true" @@ -52,8 +53,8 @@ width="64" /> </scroll_list> <text - height="13" - word_wrap="false" + height="26" + word_wrap="true" use_ellipses="false" type="string" text_color="LabelTextColor" @@ -62,7 +63,7 @@ layout="topleft" name="characters_status" top="161" - width="500"> + width="240"> Characters: </text> <button @@ -113,7 +114,7 @@ layout="topleft" name="actions_label" top_pad="12" - width="910"> + width="242"> Actions on selected characters: </text> <check_box |