diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 59cf2a68a4..d7a26c8c10 100755
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -85,10 +85,6 @@ if (ENABLE_MEDIA_PLUGINS)
 # viewer media plugins
 add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
 endif (ENABLE_MEDIA_PLUGINS)
-# <FS:AW opensim currency support>
-#teapot helper library
-add_subdirectory(${LIBS_OPEN_PREFIX}teapot)
-# </FS:AW opensim currency support>
 
 if (LINUX)
   add_subdirectory(${VIEWER_PREFIX}linux_crash_logger)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 5cca1037b0..fb2792d0e3 100755
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -97,7 +97,6 @@ set(cmake_SOURCE_FILES
     PulseAudio.cmake
     Python.cmake
     QuickTimePlugin.cmake
-    Teapot.cmake # <FS:AW opensim currency support>
     TemplateCheck.cmake
     Tut.cmake
     UI.cmake
diff --git a/indra/cmake/Teapot.cmake b/indra/cmake/Teapot.cmake
deleted file mode 100644
index e2717a224b..0000000000
--- a/indra/cmake/Teapot.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- cmake -*-
-
-
-set(TEAPOT_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/teapot
-    )
-
-
-set(TEAPOT_LIBRARIES teapot )
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 453ee9b03d..c4e8a9eda6 100755
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -261,6 +261,12 @@ list(APPEND llcommon_HEADER_FILES ${llcommon_ND_HEADER_FILES} )
 
 # </FS:ND>
 
+# <FS:ND> Add files from teapot (AW OpenSim currency support )
+list(APPEND llcommon_SOURCE_FILES  "tea.cpp" )
+list(APPEND llcommon_HEADER_FILES "tea.h" )
+# </FS:ND>
+
+
 set_source_files_properties(${llcommon_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
diff --git a/indra/teapot/tea.cpp b/indra/llcommon/tea.cpp
similarity index 100%
rename from indra/teapot/tea.cpp
rename to indra/llcommon/tea.cpp
diff --git a/indra/teapot/tea.h b/indra/llcommon/tea.h
similarity index 100%
rename from indra/teapot/tea.h
rename to indra/llcommon/tea.h
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt
index f8f31a5025..9c16913ee4 100755
--- a/indra/llinventory/CMakeLists.txt
+++ b/indra/llinventory/CMakeLists.txt
@@ -8,14 +8,12 @@ include(LLMath)
 include(LLMessage)
 include(LLVFS)
 include(LLXML)
-include(Teapot)# <FS:AW opensim currency support>
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
-    ${TEAPOT_INCLUDE_DIRS}# <FS:AW opensim currency support>
     )
 include_directories(SYSTEM
     ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index c0901c9413..97b25f6b2f 100755
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -12,7 +12,6 @@ include(LLRender)
 include(LLWindow)
 include(LLVFS)
 include(LLXML)
-include(Teapot)# <FS:AW opensim currency support>
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
@@ -25,7 +24,6 @@ include_directories(
     ${LLVFS_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     ${LIBS_PREBUILD_DIR}/include/hunspell
-    ${TEAPOT_INCLUDE_DIRS}# <FS:AW opensim currency support>
     )
 include_directories(SYSTEM
     ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
@@ -285,7 +283,6 @@ target_link_libraries(llui
     ${LLXML_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${HUNSPELL_LIBRARY}
-    ${TEAPOT_LIBRARIES}# <FS:AW opensim currency support>
     ${LLCOMMON_LIBRARIES} # must be after llimage, llwindow, llrender
     )
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f947349e0a..9fb6f91935 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -45,7 +45,6 @@ include(OPENAL)
 include(OpenGL)
 include(OpenSSL)
 include(PNG)
-include(Teapot)# <FS:AW opensim currency support>
 include(TemplateCheck)
 include(UI)
 include(UnixInstall)
@@ -108,7 +107,6 @@ include_directories(
     ${OPENAL_LIB_INCLUDE_DIRS}
     ${LIBS_PREBUILT_DIR}/include/collada/1.4
     ${GROWL_INCLUDE_DIRS}
-    ${TEAPOT_INCLUDE_DIRS}# <FS:AW opensim currency support>
     ${COLLADA_INCLUDE_DIRS}
     ${LLAPPEARANCE_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/indra/teapot/CMakeLists.txt b/indra/teapot/CMakeLists.txt
deleted file mode 100644
index 42d88c310c..0000000000
--- a/indra/teapot/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- cmake -*-
-
-project(teapot)
-include(00-Common)
-include(LLCommon)
-include(LLVFS)
-
-include_directories(
-    ${LLCOMMON_INCLUDE_DIRS}
-	${LLCOMMON_SYSTEM_INCLUDE_DIRS}
-    ${LLVFS_INCLUDE_DIRS}
-    )
-
-set(teapot_SOURCE_FILES
-    tea.cpp
-    )
-
-set(teapot_HEADER_FILES
-    CMakeLists.txt
-    tea.h
-    )
-
-set_source_files_properties(${teapot_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
-list(APPEND teapot_SOURCE_FILES ${teapot_HEADER_FILES})
-
-add_library( teapot ${teapot_SOURCE_FILES} )
-target_link_libraries( teapot )