Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

Browse Source 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
This commit is contained in:
Shyotl
2012-02-24 13:21:59 -06:00
parent 5c66c70546 0bdf54e6d9
commit a6a69caa4f
177 changed files with 9551 additions and 2012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewerinventory.cpp
View File

@@ -1060,7 +1060,7 @@ void copy_inventory_from_notecard(const LLUUID& destination_id,
// Fallback to the agents region if for some reason the
// object isn't found in the viewer.
if(!viewer_region)
if (! viewer_region)
{
viewer_region = gAgent.getRegion();
}
@@ -1090,7 +1090,10 @@ void copy_inventory_from_notecard(const LLUUID& destination_id,
body["folder-id"] = destination_id;
body["callback-id"] = (LLSD::Integer)callback_id;
LLHTTPClient::post(url, body, new LLHTTPClient::Responder() );
request["message"] = "CopyInventoryFromNotecard";
request["payload"] = body;
viewer_region->getCapAPI().post(request);
}
void create_new_item(const std::string& name,