Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a conflict with the inventory offer button enum and the profile button's index

Browse Source
This commit is contained in:
Inusaito Sayori
2013-08-22 10:09:12 -04:00
parent f90752e81c
commit fea628fd82
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewermessage.cpp
View File

@@ -1391,7 +1391,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
LLChat chat; LLChat chat;
std::string log_message; std::string log_message;
S32 button = LLNotificationsUtil::getSelectedOption(notification, response); S32 button = LLNotificationsUtil::getSelectedOption(notification, response);
if (button == 3) // profile if (button == 4) // profile
{ {
LLAvatarActions::showProfile(mFromID); LLAvatarActions::showProfile(mFromID);
LLNotification::Params p(notification["name"]); LLNotification::Params p(notification["name"]);

2
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -6735,7 +6735,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
name="Mute" name="Mute"
text="Mute"/> text="Mute"/>
<button <button
index="3" index="4"
name="Profile" name="Profile"
text="Profile"/> text="Profile"/>
</form> </form>