OpenSimulator GForge > Projects > Hippo OpenSim Viewer > SVN

Diff of /trunk/indra/newview/llfloaterteleporthistory.cpp

-revision 137, Sun Mar 21 18:22:23 2010 UTC
+revision 138, Fri Apr 30 20:03:50 2010 UTC
 Line 39
  #include "lleventpoll.h"
  #include "llagent.h"
  //mk
+ #include "llappviewer.h"
  #include "llfloaterteleporthistory.h"
  #include "llfloaterworldmap.h"
  #include "lltimer.h"
  #include "lluictrlfactory.h"
  #include "llurldispatcher.h"
  #include "llurlsimstring.h"
- #include "llviewercontrol.h"   // gSavedSettings
+ #include "llviewercontrol.h"
  #include "llviewerwindow.h"
  #include "llweb.h"
- #include "apr_time.h"
  // globals
  LLFloaterTeleportHistory* gFloaterTeleportHistory;
  LLFloaterTeleportHistory::LLFloaterTeleportHistory()
  :       LLFloater(std::string("teleporthistory")),
          mPlacesList(NULL),
-         id(0)
+         mID(0)
  {
          LLUICtrlFactory::getInstance()->buildFloater(this, "floater_teleport_history.xml", NULL);
  }
-Line 102
+Line 101
          return TRUE;
  }
- void LLFloaterTeleportHistory::addEntry(std::string regionName, S16 x, S16 y, S16 z)
+ void LLFloaterTeleportHistory::addPendingEntry(std::string regionName, S16 x, S16 y, S16 z)
  {
  #ifdef LL_RRINTERFACE_H //MK
          if (gRRenabled && gAgent.mRRInterface.mContainsShowloc)
-Line 110
+Line 109
                  return;
          }
  #endif //mk
-         // only if the cached scroll list pointer is valid
-         if(mPlacesList)
-         {
-                 // prepare display of position
-                 std::string position=llformat("%d, %d, %d", x, y, z);
-                 // prepare simstring for later parsing
-                 std::string simString = regionName + llformat("/%d/%d/%d", x, y, z);
-                 simString = LLWeb::escapeURL(simString);
+         // Set pending entry timestamp
+         U32 utc_time;
+         utc_time = time_corrected();
+         struct tm* internal_time;
+         internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
                  // check if we are in daylight savings time
                  std::string timeZone = "PST";
-                 if(is_daylight_savings()) timeZone = "PDT";
+         if (gPacificDaylightTime)
+         {
+                 timeZone = " PDT";
+         }
+ #ifdef LOCALIZED_TIME
+         timeStructToFormattedString(internal_time, gSavedSettings.getString("LongTimeFormat"), mPendingTimeString);
+         mPendingTimeString += timeZone;
+ #else
+         mPendingTimeString = llformat("%02d:%02d:%02d", internal_time->tm_hour, internal_time->tm_min, internal_time->tm_sec) + timeZone;
+ #endif
-                 // do all time related stuff as closely together as possible, because every other operation
+         // Set pending region name
-                 // might change the internal tm* buffer
+         mPendingRegionName = regionName;
-                 struct tm* internal_time;
-                 internal_time = utc_to_pacific_time(time_corrected(), is_daylight_savings());
+         // Set pending position
-                 std::string timeString=llformat("%02d:%02d:%02d ", internal_time->tm_hour, internal_time->tm_min, internal_time->tm_sec)+timeZone;
+         mPendingPosition = llformat("%d, %d, %d", x, y, z);
+         // prepare simstring for later parsing
+         mPendingSimString = regionName + llformat("/%d/%d/%d", x, y, z);
+         mPendingSimString = LLWeb::escapeURL(mPendingSimString);
+         // Prepare the SLURL
+         mPendingSLURL = LLURLDispatcher::buildSLURL(regionName, x, y, z);
+ }
+ void LLFloaterTeleportHistory::addEntry(std::string parcelName)
+ {
+         if (mPendingRegionName.empty())
+         {
+                 return;
+         }
+         // only if the cached scroll list pointer is valid
+         if (mPlacesList)
+         {
                  // build the list entry
                  LLSD value;
-                 value["id"] = id;
+                 value["id"] = mID;
-                 value["columns"][0]["column"] = "region";
+                 value["columns"][LIST_PARCEL]["column"] = "parcel";
-                 value["columns"][0]["value"] = regionName;
+                 value["columns"][LIST_PARCEL]["value"] = parcelName;
-                 value["columns"][1]["column"] = "position";
+                 value["columns"][LIST_REGION]["column"] = "region";
-                 value["columns"][1]["value"] = position;
+                 value["columns"][LIST_REGION]["value"] = mPendingRegionName;
-                 value["columns"][2]["column"] = "visited";
+                 value["columns"][LIST_POSITION]["column"] = "position";
-                 value["columns"][2]["value"] = timeString;
+                 value["columns"][LIST_POSITION]["value"] = mPendingPosition;
+                 value["columns"][LIST_VISITED]["column"] = "visited";
+                 value["columns"][LIST_VISITED]["value"] = mPendingTimeString;
                  // these columns are hidden and serve as data storage for simstring and SLURL
-                 value["columns"][3]["column"] = "slurl";
+                 value["columns"][LIST_SLURL]["column"] = "slurl";
-                 value["columns"][3]["value"] = LLURLDispatcher::buildSLURL(regionName, x, y, z);
+                 value["columns"][LIST_SLURL]["value"] = mPendingSLURL;
-                 value["columns"][4]["column"] = "simstring";
+                 value["columns"][LIST_SIMSTRING]["column"] = "simstring";
-                 value["columns"][4]["value"] = simString;
+                 value["columns"][LIST_SIMSTRING]["value"] = mPendingSimString;
                  // add the new list entry on top of the list, deselect all and disable the buttons
                  mPlacesList->addElement(value, ADD_TOP);
                  mPlacesList->deselectAllItems(TRUE);
                  setButtonsEnabled(FALSE);
-                 id++;
+                 mID++;
          }
          else
          {
                  llwarns << "pointer to places list is NULL" << llendl;
          }
+         mPendingRegionName.clear();
  }
  void LLFloaterTeleportHistory::setButtonsEnabled(BOOL on)
-Line 203
+Line 230
          LLScrollListItem *item = self->mPlacesList->getFirstSelected();
          if (item) {
                  // build secondlife::/app link from simstring for instant teleport to destination
-                 std::string slapp="secondlife:///app/teleport/" + item->getColumn(4)->getValue().asString();
+                 std::string slapp = "secondlife:///app/teleport/" + item->getColumn(LIST_SIMSTRING)->getValue().asString();
                  LLWebBrowserCtrl* web = NULL;
                  LLURLDispatcher::dispatch(slapp, web, TRUE);
          }
-Line 215
+Line 242
          LLFloaterTeleportHistory* self = (LLFloaterTeleportHistory*) data;
          // get simstring from selected entry and parse it for its components
-         std::string simString = self->mPlacesList->getFirstSelected()->getColumn(4)->getValue().asString();
+         std::string simString = self->mPlacesList->getFirstSelected()->getColumn(LIST_SIMSTRING)->getValue().asString();
          std::string region = "";
          S32 x = 128;
          S32 y = 128;
-Line 234
+Line 261
          LLFloaterTeleportHistory* self = (LLFloaterTeleportHistory*) data;
          // get SLURL of the selected entry and copy it to the clipboard
-         std::string SLURL=self->mPlacesList->getFirstSelected()->getColumn(3)->getValue().asString();
+         std::string SLURL = self->mPlacesList->getFirstSelected()->getColumn(LIST_SLURL)->getValue().asString();
          gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(SLURL));
  }

 Legend:



Removed from v.137
 


changed lines


 
Added in v.138
 Legend:



Removed from v.137
 


changed lines


 
Added in v.138
-Removed from v.137
+Added in v.138

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Hippo OpenSim Viewer

Diff of /trunk/indra/newview/llfloaterteleporthistory.cpp