summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-11-17 20:47:08 +0200
committerandreykproductengine <akleshchev@productengine.com>2015-11-17 20:47:08 +0200
commitfd742bca7a33364ffdee549e4dc949214f6720e4 (patch)
treeb64c41c8793d0d7e92a17744c96613284fe3c938 /indra
parent431f06748ec7e0f97619e5209586e0b584488a88 (diff)
MAINT-5495 linux build fix
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llinventorybridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 2f392933a9..9782c792c9 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2807,7 +2807,7 @@ void warn_move_inventory(LLViewerObject* object, boost::shared_ptr<LLMoveInv> mo
dialog = "MoveInventoryFromObject";
}
- static LLNotificationPtr notification_ptr = NULL;
+ static LLNotificationPtr notification_ptr;
static boost::shared_ptr<LLMoveInv> inv_ptr;
// Notification blocks user from interacting with inventories so everything that comes after first message