merge release@57486 release-candidate@57503
Showing
- indra/llcommon/llassettype.cpp 9 additions, 7 deletionsindra/llcommon/llassettype.cpp
- indra/llcommon/llassettype.h 5 additions, 3 deletionsindra/llcommon/llassettype.h
- indra/llcommon/llavatarconstants.h 12 additions, 0 deletionsindra/llcommon/llavatarconstants.h
- indra/llcommon/llsdutil.cpp 11 additions, 0 deletionsindra/llcommon/llsdutil.cpp
- indra/llcommon/llsdutil.h 3 additions, 0 deletionsindra/llcommon/llsdutil.h
- indra/llcommon/lluri.cpp 82 additions, 2 deletionsindra/llcommon/lluri.cpp
- indra/llcommon/lluri.h 7 additions, 0 deletionsindra/llcommon/lluri.h
- indra/llmessage/llhttpclient.cpp 8 additions, 1 deletionindra/llmessage/llhttpclient.cpp
- indra/llmessage/llhttpclient.h 3 additions, 1 deletionindra/llmessage/llhttpclient.h
- indra/newview/English.lproj/InfoPlist.strings 2 additions, 2 deletionsindra/newview/English.lproj/InfoPlist.strings
- indra/newview/Info-SecondLife.plist 1 addition, 1 deletionindra/newview/Info-SecondLife.plist
- indra/newview/llfloaterland.cpp 3 additions, 3 deletionsindra/newview/llfloaterland.cpp
- indra/newview/llfloaterproperties.cpp 1 addition, 0 deletionsindra/newview/llfloaterproperties.cpp
- indra/newview/llhudeffect.cpp 1 addition, 0 deletionsindra/newview/llhudeffect.cpp
- indra/newview/llhudmanager.cpp 7 additions, 3 deletionsindra/newview/llhudmanager.cpp
- indra/newview/llpanelavatar.cpp 32 additions, 49 deletionsindra/newview/llpanelavatar.cpp
- indra/newview/llpanelavatar.h 2 additions, 1 deletionindra/newview/llpanelavatar.h
- indra/newview/llviewermenu.cpp 24 additions, 24 deletionsindra/newview/llviewermenu.cpp
- indra/newview/llviewermessage.cpp 1 addition, 1 deletionindra/newview/llviewermessage.cpp
- scripts/messages/message_template.msg 11 additions, 5 deletionsscripts/messages/message_template.msg
Loading
Please register or sign in to comment