diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 9c40acaa62..1977f509d0 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1073,7 +1073,13 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
     // TODO - figure out if this should be moved into the noclobber fields above
     mThumbnailUUID.setNull();
     mFavorite = false;
-    mPermissions.init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null);
+    // <FS:TJ> [FIRE-36028] Fix OpenSim object permissions
+    //mPermissions.init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null);
+    if (!LLPermissions::getIsInOpenSim())
+    {
+        mPermissions.init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null);
+    }
+    // </FS:TJ>
 
     // iterate as map to avoid making unnecessary temp copies of everything
     LLSD::map_const_iterator i, end;
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index 03cd7771d4..c49bacf040 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -39,6 +39,8 @@
 
 const LLPermissions LLPermissions::DEFAULT;
 
+bool LLPermissions::sIsInOpenSim = false; // <FS:TJ/> [FIRE-36028] Fix OpenSim object permissions
+
 // No creator = created by system
 LLPermissions::LLPermissions()
 {
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index 469eacc5ef..70b29cd312 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -103,6 +103,8 @@ private:
     // values.
     bool mIsGroupOwned;
 
+    static bool sIsInOpenSim; // <FS:TJ/> [FIRE-36028] Fix OpenSim object permissions
+
     // Correct for fair use - you can never take away the right to
     // move stuff you own, and you can never take away the right to
     // transfer something you cannot otherwise copy.
@@ -288,6 +290,11 @@ public:
     inline bool allowOpenSimExportBy(const LLUUID& agent_id) const;    // <FS:CR> OpenSim export permission
 #endif
 
+    // <FS:TJ> [FIRE-36028] Fix OpenSim object permissions
+    static bool getIsInOpenSim() { return sIsInOpenSim; }
+    static void setupIsInOpenSim(bool is_in_open_sim) { sIsInOpenSim = is_in_open_sim; }
+    // </FS:TJ>
+
     //
     // MISC METHODS and OPERATORS
     //
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6e0bb1d39d..aebdbea28e 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -4886,6 +4886,10 @@ bool process_login_success_response(U32 &first_sim_size_x, U32 &first_sim_size_y
         // <FS:TJ> [FIRE-34775] Use PST/PDT when logged into OpenSim
         LLStringOps::setupUsingPacificTime(!LLGridManager::getInstance()->isInSecondLife());
         // </FS:TJ>
+        // <FS:TJ> [FIRE-36028] Fix OpenSim object permissions
+        LLPermissions::setupIsInOpenSim(!LLGridManager::getInstance()->isInSecondLife());
+        // </FS:TJ>
+
     }
 
     // set up the voice configuration.  Ultimately, we should pass this up as part of each voice