ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-16 02:25:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,995 Commits 5 Branches 96 Tags
bfd883f5330d18def06d3bf7ca4ade00e2c1b4cd
Commit Graph

119 Commits

Author SHA1 Message Date
Melanie
6f591376dd Merge branch '0.6.9-post-fixes' into careminster 2010-07-17 03:09:27 +01:00
Justin Clark-Casey (justincc)
693b5d0838 reapply fix for double sending of attachment update on standalone region crossing 2010-06-07 19:14:30 +01:00
Justin Clark-Casey (justincc)
50ddb20204 commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries 
lots of messy debug code here too which would need to be removed
 2010-06-07 19:14:22 +01:00
Melanie
cc2622660b Merge branch '0.6.9-post-fixes' into careminster 2010-06-07 05:23:52 +01:00
Justin Clark-Casey (justincc)
bdeda18b52 Revert "commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries" 
This reverts commit 5074d290e4.

This gets rid of the massive amount of scene object log spam - sorry about that, folks
 2010-06-04 18:54:58 +01:00
Melanie
0526a91206 Merge branch '0.6.9-post-fixes' into careminster 2010-05-31 17:57:48 +01:00
Justin Clark-Casey (justincc)
5074d290e4 commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries 
lots of messy debug code here too which would need to be removed
 2010-05-27 21:35:17 +01:00
Justin Clark-Casey (justincc)
427ae1087f minor: correctly print out missing item id when it can't be found rather than a NullReferenceException 2010-05-20 23:44:49 +01:00
Melanie
a1c4585a39 Merge branch '0.6.9-post-fixes' into careminster 2010-04-13 04:13:26 +01:00
John Hurliman
0f3314c04c Backported GetTextureModule and IAssetService.GetCached() 2010-04-08 15:00:01 -07:00
Melanie
1f7a0cf892 Merge branch '0.6.9-post-fixes' into careminster 2010-03-06 12:24:09 +00:00
Justin Clark-Casey (justincc)
95a31c9b6f minor: fix error inserting field in log message 2010-02-17 20:57:29 +00:00
Jeff Ames
af265e001d Formatting cleanup. 2010-02-15 19:21:56 +09:00
Melanie
2084e08ad7 Merge branch 'master' into careminster 2010-02-14 22:27:39 +00:00
Justin Clark-Casey (justincc)
802a969267 Fix http://opensimulator.org/mantis/view.php?id=4224 
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache.  However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
 2010-02-12 21:32:03 +00:00
Melanie
c8f3bb56ff Merge branch 'master' into careminster 2010-02-08 22:11:38 +00:00
Teravus Ovares (Dan Olivares)
fabf10f1cf endline fix 2 2010-02-06 00:38:22 -05:00
Melanie
a87a247f05 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:21:06 +00:00
Melanie
cfca9e1e81 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:20:13 +00:00
Melanie
b80ea00265 Merge branch 'master' into careminster 2010-01-26 14:53:14 +00:00
Revolution
ec3c31e61e Updates all IRegionModules to the new style region modules. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-23 15:18:52 +00:00
Melanie
f0152790cf Merge branch 'master' into careminster 2010-01-14 01:20:07 +00:00
Melanie
e3a04fcb7b Change the error messages on region region registration. This changes URM 
and region. The non-error case should be compatible, so no version bump.
Untested.
 2010-01-13 03:08:34 +00:00
Melanie
1676e70dfe Merge branch 'master' into careminster 2010-01-10 04:16:06 +00:00
Melanie
81d5a4b6d8 Remove "login disable", "login enable" and "login status" commands. 2010-01-10 03:03:18 +00:00
Melanie
67cfac0cf1 Merge branch 'master' into careminster 2009-12-29 18:41:45 +00:00
Melanie
0b5cdc539c Change teleports so the TeleportFlags are sent to the destination sim. It 
can now determine if a connection is from login, teleport or crossing.
Needed for a meaningful banlines implementation
 2009-12-29 18:35:06 +00:00
Melanie
84a1a0a729 Merge branch 'master' into careminster 2009-12-21 22:07:22 +00:00
Diva Canto
68187f7245 Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo. 2009-12-21 07:44:17 -08:00
Melanie
3d3e0ea4f3 Merge branch 'master' into careminster 2009-12-20 16:45:28 +00:00
Diva Canto
26e3a8ee4b * Bug fix in HG: preserve the home region coordinates across multiple HG TPs. 
* Removed unnecessary debug messages.
 2009-12-19 10:16:07 -08:00
Melanie
1382dc976c Merge branch 'master' into careminster 2009-12-12 04:14:47 +00:00
Diva Canto
decd51f081 Attempt at fixing mantis #4411. 2009-12-11 08:11:26 -08:00
Melanie
59ca92b10b Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster 2009-12-10 18:17:29 +00:00
Melanie
dd5696e8bd Same for the remote auth connector 2009-12-07 14:31:55 +00:00
Melanie
c2d3afdeee Same for the remote auth connector 2009-12-07 14:31:20 +00:00
KittoFlora
cc8246206d Secnond revision of Sit and Stand for unscripted prims; Comment out 
spammy debug messages in Interregion....
 2009-12-05 09:03:02 +01:00
Melanie
9d63f90467 Remove the old (Remoting) region crossing code. Fix the new code to 
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
 2009-11-26 17:03:09 +00:00
Justin Clark-Casey (justincc)
a7af92d5d0 minor: remove some mono compiler warnings 2009-11-09 16:03:15 +00:00
Diva Canto
9e6f01321e Fixed a couple of NREs in corner cases. 2009-11-03 10:24:02 -08:00
Diva Canto
6a6a8df1ba Make map search work also for hyperlinked regions. 2009-10-27 20:32:48 -07:00
Diva Canto
cd321ec4d2 Moved some code up to AddRegion, so that other modules that depend on it don't crash. This code needs to be removed as soon as user services is refactored. 2009-10-14 19:15:11 -07:00
Diva Canto
c0beeb929e * Fixes http://opensimulator.org/mantis/view.php?id=4225 
* Fixes http://opensimulator.org/mantis/view.php?id=3959
* Allows for viewing inventory textures outside home grid
 2009-10-12 17:00:01 -07:00
Diva Canto
3db4d38645 Removing dependencies on System.Runtime.Remoting. 2009-10-06 09:54:15 -07:00
Diva Canto
ad81b453b3 GetRegionByPosition: use the cache, Luke. 2009-10-05 09:02:52 -07:00
Jeff Ames
ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Diva Canto
b1d204802f Minor bug fixes. 2009-09-29 16:13:07 -07:00
Diva Canto
95981776dd Fixed bug in Check4096 (HG). 2009-09-28 20:11:10 -07:00
Diva Canto
51d9f7ebd4 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-28 17:35:26 -07:00
Diva Canto
4eca59ec13 Improved the Local grid connector to fetch data from the DB when it doesn't find it in the cache. 
Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes.
 2009-09-28 17:33:34 -07:00