diff options
| author | McCabe Maxsted | 2009-09-06 23:54:28 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-06 23:54:28 -0700 |
| commit | 3706bf4d5219ba607176f0465a805f29a1367ea6 (patch) | |
| tree | ab75e6df70f4914423cafb2c947246763e1f3fe6 /linden | |
| parent | Added LLScrollListCtrl::getSelectedIDs() (diff) | |
| download | meta-impy-3706bf4d5219ba607176f0465a805f29a1367ea6.zip meta-impy-3706bf4d5219ba607176f0465a805f29a1367ea6.tar.gz meta-impy-3706bf4d5219ba607176f0465a805f29a1367ea6.tar.bz2 meta-impy-3706bf4d5219ba607176f0465a805f29a1367ea6.tar.xz | |
Fixed reference to missing colors.xml entry
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/jcfloater_animation_list.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/jcfloater_animation_list.cpp b/linden/indra/newview/jcfloater_animation_list.cpp index d913292..9f5c9bb 100644 --- a/linden/indra/newview/jcfloater_animation_list.cpp +++ b/linden/indra/newview/jcfloater_animation_list.cpp | |||
| @@ -226,7 +226,7 @@ void JCFloaterAnimList::refresh() | |||
| 226 | element["id"] = LLUUID::null.combine(ai->second); | 226 | element["id"] = LLUUID::null.combine(ai->second); |
| 227 | element["columns"][LIST_ANIMATION_NAME]["column"] = "Anim Name"; | 227 | element["columns"][LIST_ANIMATION_NAME]["column"] = "Anim Name"; |
| 228 | element["columns"][LIST_ANIMATION_NAME]["type"] = "text"; | 228 | element["columns"][LIST_ANIMATION_NAME]["type"] = "text"; |
| 229 | element["columns"][LIST_ANIMATION_NAME]["color"] = gColors.getColor("DefaultListText").getValue(); | 229 | element["columns"][LIST_ANIMATION_NAME]["color"] = gColors.getColor("ScrollUnselectedColor").getValue(); |
| 230 | if(item) | 230 | if(item) |
| 231 | { | 231 | { |
| 232 | element["columns"][LIST_ANIMATION_NAME]["value"] = item->getName();//ai->second//"avatar_icon"; | 232 | element["columns"][LIST_ANIMATION_NAME]["value"] = item->getName();//ai->second//"avatar_icon"; |
| @@ -236,15 +236,15 @@ void JCFloaterAnimList::refresh() | |||
| 236 | } | 236 | } |
| 237 | element["columns"][LIST_ANIMATION_UUID]["column"] = "Animation UUID"; | 237 | element["columns"][LIST_ANIMATION_UUID]["column"] = "Animation UUID"; |
| 238 | element["columns"][LIST_ANIMATION_UUID]["type"] = "text"; | 238 | element["columns"][LIST_ANIMATION_UUID]["type"] = "text"; |
| 239 | element["columns"][LIST_ANIMATION_UUID]["color"] = gColors.getColor("DefaultListText").getValue(); | 239 | element["columns"][LIST_ANIMATION_UUID]["color"] = gColors.getColor("ScrollUnselectedColor").getValue(); |
| 240 | element["columns"][LIST_ANIMATION_UUID]["value"] = ai->second; | 240 | element["columns"][LIST_ANIMATION_UUID]["value"] = ai->second; |
| 241 | element["columns"][LIST_OBJECT_UUID]["column"] = "Source Object UUID"; | 241 | element["columns"][LIST_OBJECT_UUID]["column"] = "Source Object UUID"; |
| 242 | element["columns"][LIST_OBJECT_UUID]["type"] = "text"; | 242 | element["columns"][LIST_OBJECT_UUID]["type"] = "text"; |
| 243 | element["columns"][LIST_OBJECT_UUID]["color"] = gColors.getColor("DefaultListText").getValue(); | 243 | element["columns"][LIST_OBJECT_UUID]["color"] = gColors.getColor("ScrollUnselectedColor").getValue(); |
| 244 | element["columns"][LIST_OBJECT_UUID]["value"] = aifirst; | 244 | element["columns"][LIST_OBJECT_UUID]["value"] = aifirst; |
| 245 | element["columns"][LIST_OBJECT_OWNER]["column"] = "Source Owner"; | 245 | element["columns"][LIST_OBJECT_OWNER]["column"] = "Source Owner"; |
| 246 | element["columns"][LIST_OBJECT_OWNER]["type"] = "text"; | 246 | element["columns"][LIST_OBJECT_OWNER]["type"] = "text"; |
| 247 | element["columns"][LIST_OBJECT_OWNER]["color"] = gColors.getColor("DefaultListText").getValue(); | 247 | element["columns"][LIST_OBJECT_OWNER]["color"] = gColors.getColor("ScrollUnselectedColor").getValue(); |
| 248 | std::string name("?"); | 248 | std::string name("?"); |
| 249 | LLViewerObject *object = gObjectList.findObject(aifirst); | 249 | LLViewerObject *object = gObjectList.findObject(aifirst); |
| 250 | bool is_first = ( mObjectOwners.count( aifirst ) == 0 ); | 250 | bool is_first = ( mObjectOwners.count( aifirst ) == 0 ); |