From 32283a93e08a27e179486a5162367885131dffba Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 2 Apr 2010 13:36:58 +0300 Subject: Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) - added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/ --HG-- branch : product-engine --- indra/llui/llurlregistry.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llui/llurlregistry.cpp') diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index faa02e1904..7e09a5a919 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -55,6 +55,7 @@ LLUrlRegistry::LLUrlRegistry() registerUrl(new LLUrlEntryWorldMap()); registerUrl(new LLUrlEntryPlace()); registerUrl(new LLUrlEntryInventory()); + registerUrl(new LLUrlEntryObjectIM()); //LLUrlEntrySL and LLUrlEntrySLLabel have more common pattern, //so it should be registered in the end of list registerUrl(new LLUrlEntrySL()); -- cgit v1.2.3 From d7579203c0ec25f90839fe8fad01077ca8f9589c Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 2 Apr 2010 19:27:27 +0300 Subject: Partial fix for reopened EXT-6357 (SLapp for object chat does display an inspector) - changed the order of registering SLURLs so the LLUrlEntryObjectIM will be handled before LLUrlEntryPlace. Reviewed by Vadim Savchuk. --HG-- branch : product-engine --- indra/llui/llurlregistry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui/llurlregistry.cpp') diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 7e09a5a919..687bdc6c7d 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -53,9 +53,9 @@ LLUrlRegistry::LLUrlRegistry() registerUrl(new LLUrlEntryParcel()); registerUrl(new LLUrlEntryTeleport()); registerUrl(new LLUrlEntryWorldMap()); + registerUrl(new LLUrlEntryObjectIM()); registerUrl(new LLUrlEntryPlace()); registerUrl(new LLUrlEntryInventory()); - registerUrl(new LLUrlEntryObjectIM()); //LLUrlEntrySL and LLUrlEntrySLLabel have more common pattern, //so it should be registered in the end of list registerUrl(new LLUrlEntrySL()); -- cgit v1.2.3