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

merge changes for beta fixes

meow-7.2.2
Oz Linden 2011-05-10 17:46:32 -04:00
parent 56e471c399 6428924827
commit d86eb3dd42
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.hgtags
View File

@ -106,5 +106,6 @@ d7fcefabdf32bb61a9ea6d6037c1bb26190a85bc 2.6.3-beta1
7db558aaa7c176f2022b3e9cfe38ac72f6d1fccd DRTVWR-50_2.6.5-beta1
7db558aaa7c176f2022b3e9cfe38ac72f6d1fccd 2.6.5-beta1
800cefce8d364ffdd2f383cbecb91294da3ea424 2.6.6-start
ce588bc1ae8e3a90ee5e1f5de71a346886a9fd8b 2.6.7-start
bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 DRTVWR-52_2.6.6-beta1
bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 2.6.6-beta1
5e349dbe9cc84ea5795af8aeb6d473a0af9d4953 2.6.8-start

5
indra/newview/llviewermessage.cpp
View File

@ -344,6 +344,11 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
{
LLViewerRegion *regionp = LLWorld::getInstance()->getRegion(mesgsys->getSender());
if(!regionp)
{
llwarns << "Invalid region for layer data." << llendl;
return;
}
S32 size;
S8 type;

14
indra/newview/skins/minimal/xui/en/main_view.xml
View File

@ -8,6 +8,13 @@
tab_stop="false"
name="main_view"
width="1024">
<panel top="0"
follows="all"
height="768"
mouse_opaque="false"
name="login_panel_holder"
width="1024"/>
<layout_stack border_size="0"
follows="all"
mouse_opaque="false"
@ -90,13 +97,6 @@
visible="false"
width="500"/>
<panel top="0"
follows="all"
height="500"
mouse_opaque="false"
name="login_panel_holder"
width="1024"/>
<panel follows="all"
height="500"
left="0"