livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PE merge.

meow-7.2.2
Tofu Linden 2010-02-08 15:59:43 +00:00
parent bb977a194f ae2cbf2df8
commit a4c32f6322
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llchathistory.cpp
View File

@ -444,6 +444,7 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p)
editor_params.rect = getLocalRect();
editor_params.follows.flags = FOLLOWS_ALL;
editor_params.enabled = false; // read only
editor_params.show_context_menu = "true";
mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this);
}

6
indra/newview/llworldmapview.cpp
View File

@ -128,10 +128,10 @@ void LLWorldMapView::initClass()
sHomeImage = LLUI::getUIImage("map_home.tga");
sTelehubImage = LLUI::getUIImage("map_telehub.tga");
sInfohubImage = LLUI::getUIImage("map_infohub.tga");
sEventImage = LLUI::getUIImage("map_event.tga");
sEventMatureImage = LLUI::getUIImage("map_event_mature.tga");
sEventImage = LLUI::getUIImage("Parcel_PG_Dark");
sEventMatureImage = LLUI::getUIImage("Parcel_M_Dark");
// To Do: update the image resource for adult events.
sEventAdultImage = LLUI::getUIImage("map_event_adult.tga");
sEventAdultImage = LLUI::getUIImage("Parcel_R_Dark");
sTrackCircleImage = LLUI::getUIImage("map_track_16.tga");
sTrackArrowImage = LLUI::getUIImage("direction_arrow.tga");

1
indra/newview/skins/default/xui/en/panel_group_notices.xml
View File

@ -159,6 +159,7 @@ Maximum 200 per group daily
left_pad="3"
max_length="511"
name="create_message"
text_type="ascii"
top_delta="0"
width="220"
word_wrap="true" />

1
indra/newview/skins/default/xui/en/panel_landmark_info.xml
View File

@ -269,6 +269,7 @@
name="notes_editor"
read_only="true"
text_readonly_color="white"
text_type="ascii"
top_pad="5"
width="290"
wrap="true" />