revert last: keep --props option because of option architecture

diff --git a/docs-mini/README.xmlpanel b/docs-mini/README.xmlpanel
index 270b885b36ae8f7e7cb0d7c91dc935534ac0e7cd..960dd2e6367620e2ef555b294bf2c251a8ab201e 100644 (file)
--- a/docs-mini/README.xmlpanel
+++ b/docs-mini/README.xmlpanel
@@ -44,7 +44,7 @@ a running copy of FG allows for switching components on the fly, a
 positive boon for panel authors.  To see the property tree start FG
 with the following command line:
 
-fgfs --telnet=socket,bi,5,localhost,5500,tcp
+fgfs --props=socket,bi,5,localhost,5500,tcp
 
 Then use telnet to connect to localhost on port 5500. You can browse
 the tree as you would a filesystem.

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 3ac4f869ff7934776ea01ffdf9ada8f556e67232..06b09583eca198ef266bd6f1baba964bb9632dc6 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -527,13 +527,6 @@ parse_fov( const string& arg ) {
 
 static bool
 add_channel( const string& type, const string& channel_str ) {
-    if (type == "props")
-        SG_LOG(SG_GENERAL, SG_ALERT, "\n"
-             "****************************************************************\n"
-             "* The --props option is obsolete and will be removed in future *\n"
-             "* releases. Please use --telnet instead with the same syntax.  *\n"
-             "****************************************************************");
-
     SG_LOG(SG_GENERAL, SG_INFO, "Channel string = " << channel_str );
     globals->get_channel_options_list()->push_back( type + "," + channel_str );
     return true;