Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

This commit is contained in:
Lirusaito
2012-01-11 02:28:14 -05:00
31 changed files with 504 additions and 321 deletions

View File

@@ -774,7 +774,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
delete_context_data = FALSE;
LLSD args;
args["COST"] = llformat("%d", fee);
args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
// Set the fee for next time to 0, so that we don't keep
// asking about a fee.
LLSD next_payload = notification["payload"];