ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-08 13:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,260 Commits 5 Branches 86 Tags
747c25e92083c6a71b4163a9336c91cffa67bfb2
Commit Graph

2601 Commits

Author SHA1 Message Date
Melanie
d6b9504c84 Add methods to allow the groups modules to query online status and last login 2012-01-16 02:19:19 +01:00
Melanie
43128c9016 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-01-14 06:09:19 +00:00
Melanie
ec299bfa87 Allow SmtpClients and other SSL users to work with our cert handler installed 2012-01-14 06:03:27 +00:00
Melanie
72247bdaef Allow SmtpClients and other SSL users to work with our cert handler installed 2012-01-14 05:28:57 +01:00
Justin Clark-Casey (justincc)
b5bb559cc0 Register the UrlModule for script engine events OnScriptRemoved and OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. 
Doing this in every script is unnecessary since the event trigger is parameterized by the item id.
All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException.
Registration moved to UrlModule so that the handler is registered for all script engine implementations.
This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
 2012-01-14 00:23:11 +00:00
Bo Iwu
02d6b033d0 Fix improper code formatting introduced in 6214e6a217 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-01-13 17:10:48 -05:00
BlueWall
57ba9ef5ad Update RegionReadyModule 
Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
 2012-01-13 11:35:44 -05:00
Melanie
982f3d58a9 Merge branch 'master' into careminster 2012-01-13 04:04:39 +00:00
BlueWall
c5594e839e Undo some prior work 
Move some added fuctions out of core into the addon module to keep things clean
 2012-01-12 21:19:31 -05:00
Melanie
cf166d3f1e Merge branch 'master' into careminster 2012-01-12 23:22:55 +00:00
Diva Canto
cadd645076 Renamed one var and deleted commented code. No functional changes. 2012-01-12 10:22:52 -08:00
Melanie
4492bc1bcd Merge branch 'master' into careminster 2012-01-12 17:52:29 +00:00
Bo Iwu
6214e6a217 Allow update of stored entries within User Management Module-this is needed for proper work of HG friends. 
See http://opensimulator.org/mantis/view.php?id=5847
 2012-01-12 17:51:13 +00:00
Diva Canto
8bdd80abfa HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI. 2012-01-12 09:56:35 -08:00
Melanie
1a3a1e6665 Adapt a cast to using the new TeleportFlags 2012-01-11 19:00:17 +01:00
Justin Clark-Casey (justincc)
38db874755 If deserializing a scene object fails during IAR load then ignore the object rather than halting the IAR load with an exception. 2012-01-11 14:33:26 +00:00
Mic Bowman
5f7e392c7c Add a check to see if an asset exists before recreating it while 
loading an archive. This does add an extra roundtrip to the asset
server if loading new assets but it protects against overwriting
(and potentially corrupting) existing assets.
 2012-01-10 16:26:01 -08:00
Melanie
a4c2e7f599 Merge branch 'master' into careminster 2012-01-10 20:34:43 +00:00
Justin Clark-Casey (justincc)
18497cef73 Add avatar names to appearance log messages 2012-01-10 18:54:20 +00:00
Melanie
1cc685e820 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-01-10 18:33:32 +00:00
Diva Canto
a22d0dcab9 HG Friends: fixed bug introduced by 571efeddb2 (r/17672) 2012-01-10 09:58:53 -08:00
Melanie
6f19e231b6 Don't try to save a NPCs attachment states on NPC delete 2012-01-07 18:09:45 +00:00
Melanie
efe51fd5cb Don't try to save a NPCs attachment states on NPC delete 2012-01-07 12:06:21 +01:00
Melanie
fdfc4ab2a8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
 2012-01-06 00:08:18 +00:00
Justin Clark-Casey (justincc)
b86e7715a8 Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure 2012-01-05 22:54:33 +00:00
Justin Clark-Casey (justincc)
5ea9740f1b Add a "j2k decode" region console command that allows a manual request for a JPEG2000 decode of an asset 
For debugging purposes.
 2012-01-05 22:40:49 +00:00
Justin Clark-Casey (justincc)
c201b54b85 Improve "app rebake" command to return a better message if no uploaded texture ids were available for the rebake request 2012-01-05 19:40:54 +00:00
Melanie
1ebc9d04aa Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2012-01-05 08:15:33 +00:00
Justin Clark-Casey (justincc)
8fb70a2058 Add "appearance rebake" command to ask a specific viewer to rebake textures from the server end. 
This is not as useful as it sounds, since you can only request rebakes for texture IDs already received.
In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect.
Nonetheless, this is useful for diagnostic/debugging purposes.
 2012-01-04 22:45:07 +00:00
Justin Clark-Casey (justincc)
0634c38505 Separate out rebake request code from cache validation code AvatarFactoryModule. 
This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command).
 2012-01-04 22:22:46 +00:00
Justin Clark-Casey (justincc)
3a64522267 Minor formatting changes and commented out log lines for future debugging of image manager (udp texture fetch). No significant functional changes. 2012-01-04 21:40:15 +00:00
BlueWall
e78a3913e0 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-01-03 12:22:13 -05:00
BlueWall
2c8e72217e Merge branch 'new_modules' 2012-01-03 12:20:49 -05:00
BlueWall
6941058824 Profile Updates 
Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
 2012-01-03 11:10:23 -05:00
Melanie
a6e305063e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
	OpenSim/Services/Interfaces/IUserAccountService.cs
 2012-01-02 21:41:36 +00:00
Justin Clark-Casey (justincc)
014a86c26b Adding commented out log messages and some minor formatting for future bug hunting. No functional changes. 2012-01-02 19:46:30 +00:00
BlueWall
87374274b9 Fix for failed http request status 
Thanks "sendapatch" for fixes to llHTTPRequest status reporting.
 2012-01-01 23:44:46 -05:00
Diva Canto
571efeddb2 Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account. 2011-12-29 16:12:06 -08:00
Diva Canto
98ab3dffa3 Deleted two obsolete files in Inventory modules. 2011-12-29 15:33:04 -08:00
Diva Canto
ef4d989f37 Deleted unused methods from HGAssetBroker 2011-12-29 15:21:56 -08:00
Diva Canto
b756077269 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-12-29 12:18:22 -08:00
Diva Canto
70e36ee2b4 HG: more adjustments for making HG Simian work. Added server_uri as new key on get_agent_home in UAS. 2011-12-29 12:17:58 -08:00
Melanie
bde004c08e Merge branch 'master' into careminster 2011-12-28 09:24:35 +00:00
Melanie
5b52440e61 Introduce a LightShare kill packet ans send it when needed. Currently only 
understood by AVN v0.3
 2011-12-28 09:24:02 +00:00
Melanie
bf4d727cd5 Fix permissions being lost and correct slam behavior, removing icompatible 
code inherited from core and dead code.
 2011-12-27 14:04:49 +01:00
Melanie
ad1c6442cd Remove a debug spam 2011-12-27 01:40:44 +01:00
Melanie
41f6d6a5ff Introduce a LightShare kill packet ans send it when needed. Currently only 
understood by AVN v0.3
 2011-12-24 16:18:01 +01:00
Melanie
c4e16b26bb Merge branch 'master' into careminster 2011-12-24 02:21:35 +00:00
Diva Canto
f9a1fd5748 HG: one more adjustment with trailing /s 2011-12-23 15:08:13 -08:00
Mic Bowman
c6ce464dbc remove the old region crossing handler 2011-12-23 10:13:32 -08:00