Merge branch 'master' into DRTVWR-515-maint

1 files changed, 0 insertions, 32 deletions

diff --git a/indra/llcommon/llcoro_get_id.cpp b/indra/llcommon/llcoro_get_id.cpp
deleted file mode 100644
index 24ed1fe0c9..0000000000
--- a/indra/llcommon/llcoro_get_id.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @file   llcoro_get_id.cpp
- * @author Nat Goodspeed
- * @date   2016-09-03
- * @brief  Implementation for llcoro_get_id.
- * 
- * $LicenseInfo:firstyear=2016&license=viewerlgpl$
- * Copyright (c) 2016, Linden Research, Inc.
- * $/LicenseInfo$
- */
-
-// Precompiled header
-#include "linden_common.h"
-// associated header
-#include "llcoro_get_id.h"
-// STL headers
-// std headers
-// external library headers
-// other Linden headers
-#include "llcoros.h"
-
-namespace llcoro
-{
-
-id get_id()
-{
-    // An instance of Current can convert to LLCoros::CoroData*, which can
-    // implicitly convert to void*, which is an llcoro::id.
-    return LLCoros::Current();
-}
-
-} // llcoro