diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/llnotifications.cpp | 14 | ||||
-rw-r--r-- | linden/indra/newview/app_settings/logcontrol.xml | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/linden/indra/llui/llnotifications.cpp b/linden/indra/llui/llnotifications.cpp index 0b8bbbe..2459110 100644 --- a/linden/indra/llui/llnotifications.cpp +++ b/linden/indra/llui/llnotifications.cpp | |||
@@ -78,12 +78,12 @@ private: | |||
78 | 78 | ||
79 | void savePersistentNotifications() | 79 | void savePersistentNotifications() |
80 | { | 80 | { |
81 | llinfos << "Saving open notifications to " << mFileName << llendl; | 81 | LL_DEBUGS("Notifications") << "Saving open notifications to " << mFileName << LL_ENDL; |
82 | 82 | ||
83 | llofstream notify_file(mFileName.c_str()); | 83 | llofstream notify_file(mFileName.c_str()); |
84 | if (!notify_file.is_open()) | 84 | if (!notify_file.is_open()) |
85 | { | 85 | { |
86 | llwarns << "Failed to open " << mFileName << llendl; | 86 | LL_WARNS("Notifications") << "Failed to open " << mFileName << LL_ENDL; |
87 | return; | 87 | return; |
88 | } | 88 | } |
89 | 89 | ||
@@ -108,12 +108,12 @@ private: | |||
108 | 108 | ||
109 | void loadPersistentNotifications() | 109 | void loadPersistentNotifications() |
110 | { | 110 | { |
111 | llinfos << "Loading open notifications from " << mFileName << llendl; | 111 | LL_INFOS("Notifications") << "Loading open notifications from " << mFileName << LL_ENDL; |
112 | 112 | ||
113 | llifstream notify_file(mFileName.c_str()); | 113 | llifstream notify_file(mFileName.c_str()); |
114 | if (!notify_file.is_open()) | 114 | if (!notify_file.is_open()) |
115 | { | 115 | { |
116 | llwarns << "Failed to open " << mFileName << llendl; | 116 | LL_WARNS("Notifications") << "Failed to open " << mFileName << LL_ENDL; |
117 | return; | 117 | return; |
118 | } | 118 | } |
119 | 119 | ||
@@ -121,7 +121,7 @@ private: | |||
121 | LLPointer<LLSDParser> parser = new LLSDXMLParser(); | 121 | LLPointer<LLSDParser> parser = new LLSDXMLParser(); |
122 | if (parser->parse(notify_file, input, LLSDSerialize::SIZE_UNLIMITED) < 0) | 122 | if (parser->parse(notify_file, input, LLSDSerialize::SIZE_UNLIMITED) < 0) |
123 | { | 123 | { |
124 | llwarns << "Failed to parse open notifications" << llendl; | 124 | LL_WARNS("Notifications") << "Failed to parse open notifications" << LL_ENDL; |
125 | return; | 125 | return; |
126 | } | 126 | } |
127 | 127 | ||
@@ -129,7 +129,7 @@ private: | |||
129 | std::string version = input["version"]; | 129 | std::string version = input["version"]; |
130 | if (version != NOTIFICATION_PERSIST_VERSION) | 130 | if (version != NOTIFICATION_PERSIST_VERSION) |
131 | { | 131 | { |
132 | llwarns << "Bad open notifications version: " << version << llendl; | 132 | LL_WARNS("Notifications") << "Bad open notifications version: " << version << LL_ENDL; |
133 | return; | 133 | return; |
134 | } | 134 | } |
135 | LLSD& data = input["data"]; | 135 | LLSD& data = input["data"]; |
@@ -1302,7 +1302,7 @@ bool LLNotifications::loadTemplates() | |||
1302 | continue; | 1302 | continue; |
1303 | } | 1303 | } |
1304 | 1304 | ||
1305 | //llinfos << "Parsing " << pTemplate->mName << llendl; | 1305 | LL_DEBUGS("Notifications") << "Parsing " << pTemplate->mName << LL_ENDL; |
1306 | 1306 | ||
1307 | pTemplate->mMessage = item->getTextContents(); | 1307 | pTemplate->mMessage = item->getTextContents(); |
1308 | pTemplate->mDefaultFunctor = pTemplate->mName; | 1308 | pTemplate->mDefaultFunctor = pTemplate->mName; |
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml index 3f4fdbf..639a750 100644 --- a/linden/indra/newview/app_settings/logcontrol.xml +++ b/linden/indra/newview/app_settings/logcontrol.xml | |||
@@ -61,6 +61,7 @@ | |||
61 | <!--<string>MediaState</string>--> | 61 | <!--<string>MediaState</string>--> |
62 | 62 | ||
63 | <!--<string>Messaging</string>--> | 63 | <!--<string>Messaging</string>--> |
64 | <!--<string>Notifications</string>--> | ||
64 | <!--<string>ShaderLoading</string>--> | 65 | <!--<string>ShaderLoading</string>--> |
65 | 66 | ||
66 | <!--<string>Openjpeg</string>--> | 67 | <!--<string>Openjpeg</string>--> |