Index: /branches/rel_ag_9_4_5/restfulapi/proxy/hive/tz.h
===================================================================
--- /branches/rel_ag_9_4_5/restfulapi/proxy/hive/tz.h	(revision 20559)
+++ /branches/rel_ag_9_4_5/restfulapi/proxy/hive/tz.h	(working copy)
@@ -264,6 +264,15 @@
 { { "Asia/Kolkata", "Kolkata" }
 };
 
+/*TWSD-1437*/
+/*Add Oman option*/
+/*
+ * Oman Time Zone Map
+ */
+time_zone_t om_tz_map[NUM_OM_TZ] = 
+{ { "Asia/Muscat", "Muscat" } };
+/*TWSD-1437 end*/
+
 /*Bug 9886, qiuzj,20050606*/
 /*revise the system timezone error*/
 country_t asia_countries[NUM_ASIA_COUNTRIES] = 
@@ -277,7 +286,8 @@
   { sg_tz_map, "Singapore", NUM_SG_TZ },
   { th_tz_map, "Thailand", NUM_TH_TZ },
   { vn_tz_map, "Vietnam", NUM_VN_TZ },
-  { uae_tz_map, "United Arab Emirates", NUM_UAE_TZ }
+  { uae_tz_map, "United Arab Emirates", NUM_UAE_TZ },
+  {om_tz_map, "Oman", NUM_OM_TZ} 
 };
 /*Bug 9886,end*/
 /*Bug 15310, LiBo,20070123*/
Index: /branches/rel_ag_9_4_5/ui/backend/sys_time.h
===================================================================
--- /branches/rel_ag_9_4_5/ui/backend/sys_time.h	(revision 20559)
+++ /branches/rel_ag_9_4_5/ui/backend/sys_time.h	(working copy)
@@ -81,6 +81,7 @@
 #define NUM_ISTN_TZ                     1
 #define NUM_BUD_TZ                      1
 #define NUM_BRS_TZ                      1
+#define NUM_OM_TZ						1
 
 
 #define NUM_EG_TZ                       1
@@ -120,7 +121,7 @@
 #define NUM_GUI_TZ                      1
 #define NUM_GUIB_TZ                     1
 #define NUM_SEN_TZ                      1
-#define NUM_ASIA_COUNTRIES              46 
+#define NUM_ASIA_COUNTRIES              47
 #define NUM_EUROPE_COUNTRIES            20 
 #define NUM_NORTH_AMERICA_COUNTRIES     2
 #define NUM_OCEANIA_COUNTRIES	        5	
Index: /branches/rel_ag_9_4_5/webui/proxy/new/incGlobal/sysConfig/generalSettings/class.cliWrap_gBasicTimezone.php
===================================================================
--- /branches/rel_ag_9_4_5/webui/proxy/new/incGlobal/sysConfig/generalSettings/class.cliWrap_gBasicTimezone.php	(revision 20559)
+++ /branches/rel_ag_9_4_5/webui/proxy/new/incGlobal/sysConfig/generalSettings/class.cliWrap_gBasicTimezone.php	(working copy)
@@ -230,7 +230,7 @@
 			continent = new Array("Asia", "Europe", "North America", "Oceania"); // continents
 
 			country = new Array();
-			country[0] = new Array("China", "India", "Indonesia", "Japan", "Malaysia", "Philippines", "South Korea", "Singapore", "Thailand", "Vietnam"); // asia countries
+			country[0] = new Array("China", "India", "Indonesia", "Japan", "Malaysia", "Philippines", "South Korea", "Singapore", "Thailand", "Vietnam", "Oman"); // asia countries
 			country[1] = new Array("France", "Germany", "United Kingdom"); // europe countries
 			country[2] = new Array("Canada", "United States");
 			country[3] = new Array("Australia", "New Zealand");
@@ -247,6 +247,7 @@
 			timezone[0][7] = new Array("Singapore Time"); //Singapore Time
 			timezone[0][8] = new Array("Thailand Time"); //Singapore Time
 			timezone[0][9] = new Array("Vietnam Time"); //Vietnam Time
+			timezone[0][10] = new Array("Muscat"); //Oman Time
 			
 			timezone[1] = new Array();
 			timezone[1][0] = new Array("France Time"); //France Time