diff options
| -rw-r--r-- | BuildParams | 46 | ||||
| -rw-r--r-- | indra/newview/llurldispatcher.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewernetwork.h | 3 |
3 files changed, 2 insertions, 51 deletions
diff --git a/BuildParams b/BuildParams index f78a4a1262..b3a9391f92 100644 --- a/BuildParams +++ b/BuildParams @@ -36,26 +36,6 @@ viewer-development.build_debug_release_separately = true # <username>_<reponame>.email = <email-address> -# ================================================================= -# Canonical viewer integration builds - Oz Linden -# ================================================================= -integration_viewer-development.viewer_channel = "Second Life Development" -integration_viewer-development.login_channel = "Second Life Development" -integration_viewer-development.build_viewer_update_version_manager = false -integration_viewer-development.email = viewer-development-builds@lists.secondlife.com -integration_viewer-development.build_enforce_coding_policy = true -integration_viewer-development.codeticket_add_context = true - -viewer-beta.viewer_channel = "Second Life Beta Viewer" -viewer-beta.login_channel = "Second Life Beta Viewer" -viewer-beta.build_debug_release_separately = true -viewer-beta.build_viewer_update_version_manager = true - -viewer-release.viewer_channel = "Second Life Release" -viewer-release.login_channel = "Second Life Release" -viewer-release.build_debug_release_separately = true -viewer-release.build_viewer_update_version_manager = true - # ======================================== # mesh-development # ======================================== @@ -123,32 +103,6 @@ viewer-pathfinding.build_debug_release_separately = true viewer-pathfinding.build_CYGWIN_Debug = false viewer-pathfinding.build_viewer_update_version_manager = false -# ================ -# oz -# ================ - -Snowstorm_viewer-project-review.build_debug_release_separately = true -Snowstorm_viewer-project-review.codeticket_add_context = true -Snowstorm_viewer-project-review.viewer_channel = "Project Viewer - Snowstorm Team" -Snowstorm_viewer-project-review.login_channel = "Project Viewer - Snowstorm Team" -Snowstorm_viewer-project-review.codeticket_add_context = true - -oz_viewer-devreview.build_debug_release_separately = true -oz_viewer-devreview.codeticket_add_context = false -oz_viewer-devreview.build_enforce_coding_policy = true -oz_viewer-devreview.email = oz@lindenlab.com - -oz_viewer-trial.build_debug_release_separately = true -oz_viewer-trial.codeticket_add_context = false -oz_viewer-trial.build_enforce_coding_policy = true -oz_viewer-trial.email = oz@lindenlab.com - -oz_viewer-beta-review.build_debug_release_separately = true -oz_viewer-beta-review.codeticket_add_context = false -oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer" -oz_viewer-beta-review.login_channel = "Second Life Beta Viewer" -oz_viewer-beta-review.email = oz@lindenlab.com - # ================================================================= # asset delivery 2010 projects # ================================================================= diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index f514254f8f..00b15a5f26 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -205,8 +205,8 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const LLSLURL& { // we can't teleport cross grid at this point - if((!LLGridManager::getInstance()->isSystemGrid(slurl.getGrid()) || !LLGridManager::getInstance()->isSystemGrid()) && - (slurl.getGrid() != LLGridManager::getInstance()->getGrid())) + if( LLGridManager::getInstance()->getGrid(slurl.getGrid()) + != LLGridManager::getInstance()->getGrid()) { LLSD args; args["SLURL"] = slurl.getLocationString(); diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h index 8c4990f8fe..3f56103b2e 100644 --- a/indra/newview/llviewernetwork.h +++ b/indra/newview/llviewernetwork.h @@ -199,9 +199,6 @@ class LLGridManager : public LLSingleton<LLGridManager> bool addGrid(LLSD& grid_info); ///< @returns true if successfully added - /// find the LLSD definition for a given grid - void getGridInfo(const std::string& grid, LLSD &grid_info); - void updateIsInProductionGrid(); // helper function for adding the hard coded grids |