Merge branch 'master' of https://github.com/RouterGray/SingularityViewer

# Conflicts:
#	indra/newview/llexperiencelog.cpp

indra/newview/skins/default/xui/en-us/menu_inventory.xml

@@ -94,6 +94,9 @@
 	<menu_item_call label="Open in New Window" name="Open Folder In New Window">
 		<on_click function="Inventory.DoToSelected" userdata="open_in_new_window"/>
 	</menu_item_call>
+	<menu_item_call label="Copy Folder UUID" name="Copy Folder UUID">
+		<on_click function="Inventory.DoToSelected" userdata="copy_folder_uuid"/>
+	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="New Folder" left="0" mouse_opaque="true"
 	     name="New Folder" width="128">
 		<on_click filter="" function="Inventory.DoCreate" userdata="category" />

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

@@ -7164,7 +7164,7 @@ Event Notification:
       <button
        index="2"
        name="Cancel"
-       text="Cancel"/>
+       text="Dismiss"/>
     </form>
   </notification>