diff -r 1f58177f6740 -r 9894ed580e4a mmserv/sts/stsserver/inc/stsclientservercommon.h
--- a/mmserv/sts/stsserver/inc/stsclientservercommon.h	Thu Aug 12 20:27:32 2010 -0500
+++ b/mmserv/sts/stsserver/inc/stsclientservercommon.h	Tue Aug 24 03:16:41 2010 -0500
@@ -15,7 +15,6 @@
  * This file defines common types and constants used by the STS server
  * and sessions.
  */
-
 #ifndef STSCLIENTSERVERCOMMON_H_
 #define STSCLIENTSERVERCOMMON_H_
 
@@ -38,7 +37,7 @@
     StsMsg_StopAlarm,
     StsMsg_PlayTone,
     StsMsg_PlayAlarm,
-    StsMsg_PlayToneStop,
+    StsMsg_PlayToneAlarm,
     StsMsg_ENDMARKER
     };
 
@@ -47,8 +46,7 @@
 
 enum TStsCallBackType
     {
-    EStsShutdown,
-    EStsPlayAlarmComplete
+    EStsShutdown, EStsPlayAlarmComplete
     };
 
 struct TStsCallBack