ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-23 06:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,081 Commits 5 Branches 106 Tags
ebeef02fef1a04b5b4cfe13dad588bcce7f9ba21
Commit Graph

527 Commits

Author SHA1 Message Date
Diva Canto
8fdc810a23 Addresses mantis #5360: CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information. 2011-02-03 04:07:36 -08:00
Justin Clark-Casey (justincc)
4f7cf491e6 Comment out texture CAPS 'texture not found' message for now 2011-02-02 20:02:10 +00:00
Justin Clark-Casey (justincc)
ab1ec3c3cc minor: remove a few mono compiler warnings 2011-01-28 21:51:25 +00:00
Mic Bowman
c4727645b8 Removed a few more spurious appearance saves. When an avatar 
enters a region the attachments module tries to update the
appearance with attachments that are already part of the appearance.
Just added a check to only save if the attachments weren't there
before.
 2011-01-25 14:23:58 -08:00
Justin Clark-Casey (justincc)
41105948bd remove some mono compiler warnings 2011-01-21 23:19:52 +00:00
Justin Clark-Casey (justincc)
d3dca7d25a For now, comment out logging messages about IM sending, since these cause high spam for large group messaging 2011-01-19 01:50:02 +00:00
Justin Clark-Casey (justincc)
28fda1cab6 with mic's permission, reduce appearance, baked texture logging verbosity for now 2011-01-19 01:41:32 +00:00
Justin Clark-Casey (justincc)
a42faca5b9 With mic's permission, adjust long call time info messages to 500ms from 200ms 2011-01-19 01:13:10 +00:00
Justin Clark-Casey (justincc)
97c0430093 Downgrade and comment out some other caps messages for now 2011-01-19 01:10:09 +00:00
Melanie
9f7b37b37c Fix build break 2011-01-18 01:48:37 +00:00
Melanie
ac16a49ca0 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-01-18 01:27:11 +00:00
Melanie
31144a62b3 Change gesture activation to not quash any other flags 2011-01-18 01:26:37 +00:00
Justin Clark-Casey (justincc)
c544f0d0c5 Prune some of the excess logging for client logins. 
Didn't touch the appearance related stuff.
 2011-01-18 00:25:24 +00:00
Diva Canto
35a2961ccd Added a -v|verbose option to save iar. 2011-01-08 16:17:00 -08:00
Melanie
07cc032081 Allow cross-scope friendships to work, and also allow other cross scope name 
resolution
 2011-01-03 19:42:46 +00:00
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