ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 22:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,914 Commits 5 Branches 88 Tags
d829580e5e3fa1db760dc764c0ca76e65dd9b4c8
Commit Graph

512 Commits

Author SHA1 Message Date
Melanie
990e73d7cb Fix a broken format on an error message. Also replace yet another e.Message 
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
 2010-12-22 17:33:06 +00:00
Justin Clark-Casey (justincc)
223264047e uncomment "load iar" help lines which added the --merge option 2010-12-18 00:59:37 +00:00
Justin Clark-Casey (justincc)
bf9555eaee minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid 2010-12-18 00:57:09 +00:00
Justin Clark-Casey (justincc)
ef43f98686 Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops) 2010-12-18 00:45:56 +00:00
Justin Clark-Casey (justincc)
e62b3dba8a reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being used by a 3rd party region module and contains non-obvious attachment specific code 
There are no functional changes.  UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
 2010-12-14 00:11:41 +00:00
Justin Clark-Casey (justincc)
b46de6e025 Remove the restriction that you have to be logged in when loading/saving iars 
This is pointless as we're supplying the password on the command line
 2010-12-11 03:09:00 +00:00
Justin Clark-Casey (justincc)
387f743993 If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases. 2010-12-11 02:18:16 +00:00
Diva Canto
ab980fc927 Fixed wrong comment 2010-12-08 19:47:05 -08:00
Diva Canto
90bcfefe09 Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet... 2010-12-08 19:37:35 -08:00
Diva Canto
1070cffcf9 Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>. 2010-12-08 18:53:15 -08:00
Jonathan Freedman
45cd2e3ef9 Merge branch 'master-core' into mantis5110 2010-12-05 11:49:15 -08:00
Mic Bowman
df860516bf Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. 
Cleaned up (and added) debugging.
 2010-12-03 23:45:00 +00:00
Diva Canto
f3835fe15c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-29 09:58:20 -08:00
Diva Canto
49b59fffee Fix unit test. 2010-11-29 09:57:41 -08:00
Diva Canto
f86c438653 Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. 2010-11-29 08:43:33 -08:00
Mic Bowman
541a7660e0 Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. 
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
 2010-11-27 01:14:36 +00:00
Jonathan Freedman
bc51dfc45e Merge branch 'master-core' into mantis5110 2010-11-23 22:27:54 -08:00
Justin Clark-Casey (justincc)
63170fdea7 Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory 2010-11-23 04:26:07 +00:00
Jonathan Freedman
b7f5e82843 Merge branch 'master-core' into mantis5110 2010-11-21 20:01:48 -08:00
Jonathan Freedman
562147475c Merge https://github.com/opensim/opensim into mantis5110 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2010-11-21 19:51:23 -08:00
Diva Canto
6a9ae9e7cb Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority. 
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
 2010-11-21 13:16:52 -08:00
Master ScienceSim
8f1a79420b Fixed appearance send for avatars with only default textures. This should fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-11-18 19:04:50 +00:00
Melanie
7bb005b0d1 Change the way attachments are persisted. Editing a worn attachment will now 
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
 2010-11-16 21:01:56 +00:00
Jeff Ames
ae9c4a4d11 Formatting cleanup. 2010-11-08 07:48:35 -05:00
Melanie
6585243113 Detach attachments displaced by other attachments 2010-11-08 02:35:47 +00:00
Jonathan Freedman
95a0ea78f9 Merge branch 'master' into mantis5110 2010-10-30 18:28:07 -04:00
Jonathan Freedman
e371d3208c Merge branch 'master' into mantis5110 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
 2010-10-30 14:10:13 -04:00
Melanie
e98d8d500f Fix logins and avatar appearance. Contains a Migration. May contain nuts. 
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
 2010-10-30 19:06:47 +01:00
Jonathan Freedman
9e7d3e0f25 Merge branch 'master' into mantis5110 2010-10-29 23:59:16 -04:00
Jonathan Freedman
c8d65c359f Merge branch 'master' into mantis5110 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2010-10-29 23:58:14 -04:00
Jonathan Freedman
d219317074 Merge branch 'master' into mantis5110 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2010-10-29 23:12:51 -04:00
Justin Clark-Casey (justincc)
f9227977f8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-10-30 03:07:45 +01:00
Justin Clark-Casey (justincc)
45220a6954 minor: remove some old commented out code 2010-10-30 03:01:40 +01:00
Melanie
7503c4ad61 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-30 00:56:42 +01:00
Melanie
818ed2032a READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. 
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
 2010-10-30 00:41:36 +01:00
Justin Clark-Casey (justincc)
e66ec432af Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic 2010-10-29 23:45:10 +01:00
Master ScienceSim
f5c9a56c8b Bunch of fixes that reduce the number of times appearance 
and avatar data are sent. And the number of times they
are stored.
 2010-10-29 13:43:35 -07:00
Master ScienceSim
68666efd25 Configuration of persistent baked textures and save/send delays. 2010-10-28 12:00:04 -07:00
Master ScienceSim
f2c1d0e34f Merge branch 'opensim-master' into dev-appearance 2010-10-28 09:09:42 -07:00
Master ScienceSim
0f28fa400d Added background thread to handle delayed send and save of appearance 
to accommodate batching of the many updates that happen on login
and teleport.

Fixed handling of the serial property in appearance.
 2010-10-28 09:00:39 -07:00
Jeff Ames
a331fd4e24 Formatting cleanup. 2010-10-27 00:01:03 -04:00
Master ScienceSim
9132e251aa Made the check for texture assets asynchronous. This is one part of 
a bigger clean up that needs to happen around locks on appearance.
 2010-10-26 12:53:15 -07:00
Master ScienceSim
6e58c3d563 Half of the compatibility is working. Login into a new region with 
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
 2010-10-25 14:11:47 -07:00
Justin Clark-Casey (justincc)
fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'" 
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
 2010-10-22 23:52:07 +01:00
Jonathan Freedman
38e76d71ac Merge branch 'hg16' into mantis5110 2010-10-22 18:34:50 -04:00
Justin Clark-Casey (justincc)
a7a8fdc7da print IAR version number on console when saving 2010-10-22 18:33:52 -04:00
Justin Clark-Casey (justincc)
bdd6857006 Implement guard against trying to load incompatible version IARs 2010-10-22 18:33:47 -04:00
Justin Clark-Casey (justincc)
607c07b4aa start parsing iar control file 
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
 2010-10-22 18:33:41 -04:00
Justin Clark-Casey (justincc)
460b9fffe5 write IAR control file first in the archive rather than last 2010-10-22 18:33:32 -04:00
Justin Clark-Casey (justincc)
e06acae965 Allow region modules to know which agents actually receive chat 2010-10-22 18:33:19 -04:00